Merge

You might say

The feature I built separately works. How do I bring it back into the main version?

Combine the commits from one branch into anotherMerge brings two lines of history together. Git can combine independent changes automatically, but overlapping edits may create conflicts that a person must resolve. Review the result and run tests after resolving, because a clean text merge can still break behavior.

Know first

Branch Commit

main version

New Features

✓The main version has been updatedThe changes on both sides have been put together

git merge feature/new-nav

Merge brings the completed changes of another branch into the current branch. If both sides have changed the same place, Git will pause and ask you to decide what to keep in the end.

Quick checkChoose the best answer

A feature branch is ready for main, but both sides changed one line. What is the reliable conflict handling?

Understand both intents, produce the correct combined content, clear markers, and run relevant testsAlways choose the current branch because it is closest to your workCommit the conflict markers and let CI decide later

You can say this to an AI Agent

Merge this feature branch into its target. First inspect what each side must preserve, resolve the conflict, confirm no markers remain, and run relevant tests. Report the merge and test results; do not resolve it by arbitrarily choosing one side.

When to use it

Bring a reviewed feature into main
Combine work from two branches
Keep both lines of history
Integrate a finished fix

When NOT to use it

Resolve a conflict without understanding both sides
Merge into the wrong target branch
Assume no text conflict means no product conflict
Mix unrelated cleanup into conflict resolution

Anatomy

<<<<<<< HEAD

Xiaoli's homepage

=======

Xiaoli’s photography homepage

>>>>>>> feature/new-nav

Starting here is the conflict area, HEAD refers to the version of the branch you are currently on.

What does this line look like on the current branch? It is usually the content of the main line.

The boundary between the upper and lower versions must be deleted together when resolving the conflict.

What does this line look like on the merged branch?

The conflict area ends here, marking which branch the content comes from.

Variants

Fast-forward

Updating a3f9c21..e7b2d48

The target branch has no independent new commits

Merge Commit

Merge made by the 'ort' strategy.

There are new commits on both sides and the merge node needs to be retained

merge --abort

git merge --abort

When you need to abandon the current unfinished merge

Typical use cases

Feature integration

zsh — my-first-page

$ git switch main Switched to branch 'main' $ git merge feature/new-nav Merge made by the 'ort' strategy. index.html | 24 ++++++++++++++----- 1 file changed, 16 insertions(+), 8 deletions(-)

Pull request merge

📄 index.html⚠ 1 conflict

<<<<<<< HEAD (main line)
Xiaoli’s homepage
=======
Xiaoli’s photography homepage
>>>>>>> feature/new-nav (branch)

Edit to the final content, remove all conflict tags and resubmit

Release preparation

📄 index.html Merge conflict

Adopt current changesAdopt incoming changesKeep changes from both parties

Xiaoli’s homepage (current · HEAD)
Xiaoli's photography homepage (incoming · branch)

You can choose to keep current changes, incoming changes, or both changes

Conflict resolution

New navigation bar #2

maya-lee wants to merge feature/new-nav into main

✓ This branch has no conflict with the base branch

Merge pull request

Click this green button on the web page, the effect is equivalent to git merge