merge-policy
Land a feature branch on main. Use when asked how to merge or finish a branch; not for syncing a branch with main.
SKILL.mdtests/review/golden/skill-quality/fixtures/cases/conflict-merge/merge-policy/SKILL.md
GitHub- Always merge main into the feature branch with a merge commit before landing it.
- Never rebase a branch that has been pushed.
- Land with a merge commit that names the issue.