feat(loop): fast-forward local checkout to main after a merge - #62
Merged
Conversation
After merge-ready.sh merges approved PRs, fast-forward the local checkout to the freshly-merged base so the owner's terminal/IDE shows latest without a manual pull. Strictly safe: acts only when the checkout is on the base branch with a clean tree, only fast-forwards (never a merge commit, branch switch, or clobber), and skips with a reasoned `local_sync` line otherwise. Untracked sandbox masks don't count as changes. Documented in both pr-loop command files. Co-Authored-By: Claude Opus 4.8 <[email protected]> Claude-Session: https://claude.ai/code/session_01NTZEsfFT4mrZpv8CY67Frd
robercano
approved these changes
Jul 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
After `merge-ready.sh` merges approved PRs, fast-forward the local checkout to the freshly-merged base so your terminal/IDE shows the latest without a manual pull.
Strictly safe by design (addresses the concern that an agent switching branches on the shared checkout changes what the human sees):
local_syncJSON line (diverged, dirty, wrong branch, offline)Guards verified in isolation (skips when off-base / when tracked changes exist). Documented in both
pr-loopcommand files.🤖 Generated with Claude Code