fix(patterns): add post-merge local sync and address hooks issue (#381, #378)#382
Merged
RyderFreeman4Logos merged 1 commit intomainfrom Mar 8, 2026
Merged
Conversation
#381) After `gh pr merge` completes (remote-side squash-merge), the local main branch was not synced with the remote. This caused local main to stay on a stale commit, requiring manual `git fetch && git merge --ff-only`. Changes: - dev2merge: add Step 21 (Post-Merge Local Sync) with `git fetch origin && git checkout main && git merge origin/main --ff-only` and feature branch cleanup (local + remote) - pr-codex-bot: replace `git checkout main && git pull origin main` with explicit `git fetch origin && git merge origin/main --ff-only` in all three merge steps (6a, 12, 12b), plus local branch cleanup - Update SKILL.md done criteria and step descriptions for both patterns - Sync workflow.toml steps with PATTERN.md changes Closes #381 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
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.
Summary
git fetch origin && git checkout main && git merge origin/main --ff-only) to bothdev2mergeandpr-codex-botpatterns. Also adds feature branch cleanup (localgit branch -d+ remotegit push origin --delete).just fmtbefore staging andjust pre-commitafter review fixes) already addresses the auto-fmt race condition. A full hook system (hooks.toml) remains a future enhancement.Changes
dev2merge
PATTERN.mdandworkflow.tomlSKILL.mddone criteria fix(run_helpers): reduce false positives in edit intent inference #13 and step feat(debate): add csa debate CLI command #17pr-codex-bot
git checkout main && git pull origin mainwith explicitgit fetch origin && git merge origin/main --ff-onlyin all three merge steps (6a, 12, 12b)SKILL.mddone criteria fix(run_helpers): reduce false positives in edit intent inference #13 and step merge(main): integrate base branch updates #11Version
Test plan
just pre-commitpasses (fmt, clippy, deny, tests)weave lockverifies pattern/workflow syncCloses #381
🤖 Generated with Claude Code