feat(git): v9.4.0 branch lifecycle discipline#176
Merged
Conversation
… feature branches - merge-local: sync main + reset dev to origin/main before squash-merge, delete feature branch after - create-pr: sync local branches after PR merged to prevent history divergence - structure-feature: pull remote main before creating feature branch - git-conventions: document Branch Lifecycle concept, update Conflict Prevention
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
Prevents merge conflicts from diverged dev/main histories by enforcing a branch lifecycle discipline across three skills and the git conventions knowledge base.
Changes
origin/mainbefore squash-merge, delete feature branch after mergeorigin/mainfor clean next cycleWhy
After a PR is squash-merged (dev → main on GitHub), local dev retains its original history while main has a new squash commit. The next PR (dev → main) conflicts because histories diverged. Fix: reset dev to
origin/mainafter each PR merge and before each squash-merge.