Skip to content

Make resume work with merge commits - #25

Merged
Soph merged 2 commits into
mainfrom
soph/resume-merge-commit-branches
Jan 9, 2026
Merged

Soph merged 2 commits into
mainfrom
soph/resume-merge-commit-branches

Conversation

@Soph

@Soph Soph commented Jan 8, 2026

Copy link
Copy Markdown
Collaborator

The current resume command checks only the HEAD commit for trailers. If they don't exist it can't work. I did run into this today when trying to resume a PR from yesterday which in the meantime had main branch merged in.

This now handles this more gracefully:

  1. Checks out the specified branch
  2. Finds the session ID from commits unique to this branch (not on main)
  3. Restores the session log if it doesn't exist locally
  4. Shows the command to resume the session
    If the branch doesn't exist locally but exists on origin, you'll be prompted
    to fetch it.

If newer commits exist on the branch without checkpoints (e.g., after merging main),
you'll be prompted to confirm resuming from the older checkpoint.

As a non-interactive way --force can be used to always resume what ever is found first.

@Soph
Soph merged commit e9e6285 into main Jan 9, 2026
3 checks passed
@Soph
Soph deleted the soph/resume-merge-commit-branches branch January 9, 2026 14:51
Soph added a commit that referenced this pull request Sep 11, 2026
entireio/auth-go#25, merged as f3d099d. oauthhttp.HTTPClient — the one
construction point behind sts, refresh, authcode and deviceflow — now
refuses a redirect that leaves the host the caller targeted, and refuses
any hop that leaves https once a chain has reached it.

First in the series because the next commit's regression test depends on
it: without this bump TestRoundTripper_RejectsRedirectedExchangePOST
fails, reporting the login JWT reaching the redirect target.

This replaces the local-path `replace` directive the branch carried while
#25 was in review.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Entire-Checkpoint: 01M27SH4XARVKD62BMEGSM42YF
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants