git-merge

Git merge strategies control how branch history is preserved or flattened. Fast-forward moves the pointer without a merge commit, no-ff preserves branch context with a merge commit, and squash combines all feature commits into a single commit on the target branch.

To resolve git merge conflicts safely, this Skill detects conflicts and provides automated guidance for resolution workflows. It offers safe-abort procedures to cancel merges and verification commands to ensure the final merge is successful and correct.

You can abort a git merge and cancel changes using safe-abort procedures provided by this Skill. It guides you through cancellation commands to undo an in-progress merge, returning the branch to its pre-merge state without losing uncommitted work.

A three-way git merge is needed when the target branch has diverged with new commits since the feature branch was created. Fast-forward only works if the target branch hasn't changed, while three-way merges use a dedicated merge commit to join both histories.

You verify a successful git merge by running common git commands provided as verification steps. This Skill outputs specific verification commands to check history integrity and confirm that the branch changes were applied correctly to the target branch.