07 Bring work together with merge

7 / 33

Goal

Merge feature into main.

main and feature have diverged. To combine them, Git finds their common ancestor, works out what each side changed since then, and records the result as a merge commit — the only kind of commit with two parents.

You merge into the branch you're on. git merge feature while on main brings feature's work into main; feature itself doesn't move.

Try it

Merge feature into main and look at the new commit's two parent lines.

When both sides change the same lines, Git can't decide for you and stops with a conflict. You edit the file, git add it, and git commit to finish the merge.

Go to the terminal

Hint

You're already on main. git merge feature does the rest.

Show a solution

git merge feature

This interactive environment needs JavaScript. Everything you need to read is on this page, and the solution works the same way for real.

Git

Starting Git…