Auto-update session branch to remote tip and origin/main#78
Merged
Conversation
Resumed web containers hold a clone frozen at creation time, so the branch's own remote tip and origin/main both go stale. On session start, fast-forward to the remote tip if it advanced and merge origin/main when behind (GitHub "Update branch" semantics). A dirty tree skips the update and a conflicting merge is aborted with a note instead of leaving the tree half-merged. https://claude.ai/code/session_014KGbtj3XCDk8SvkteHfsai
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.
Summary
Add automatic branch synchronization to the session startup hook. When a session resumes, the branch is now kept current with its remote tip and merged with
origin/mainif behind, ensuring diff-scoped gates (diff-cover, mutation) compare against the latest upstream state.Changes
session-start.sh:origin/mainorigin/maininto the branch if behind, with a commit count loggedImplementation Details
HEADdetached state andmainitself)--ff-onlyfor the branch fast-forward to prevent accidental merges--no-editfor theorigin/mainmerge to avoid interactive promptshttps://claude.ai/code/session_014KGbtj3XCDk8SvkteHfsai