Pull base worktree after guarded finish#664
Merged
NagyVikt merged 1 commit intoJun 29, 2026
Merged
Conversation
Why: keep local base checkouts from staying behind after Guardex finishes a merge. Constraint: use git pull --ff-only with autostash disabled, so dirty local edits are preserved or Git refuses the refresh. Tested: node --test --test-reporter=spec --test-name-pattern "dirty local base worktree" test/finish.test.js Tested: bash -n templates/scripts/agent-branch-finish.sh Tested: openspec validate agent-codex-auto-pull-base-after-pr-merge-2026-06-29-23-02 --type change --strict Tested: openspec validate --specs Not-tested: full test/finish.test.js is not green in this harness; failures observed in existing gh-host/protected-push/gitlink cases outside the targeted dirty-base refresh coverage.
NagyVikt
deleted the
agent/codex/auto-pull-base-after-pr-merge-2026-06-29-23-02
branch
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
1 participant
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.
Automated by gx branch finish (PR flow).