A Real Merge
Join two diverged histories with a merge commit.
Now the interesting case: both branches moved. main got a commit while you were working on feature, so the histories have genuinely diverged; no label can just slide forward.
This time git merge creates a special new commit, a merge commit, with two parents, one in each world. It's the knot that ties the two histories back together.
In real projects, two branches sometimes edit the same line and git asks you to pick: a merge conflict. In this sandbox, merges never conflict, so you can focus on the shape.
git merge <name>Diverged histories? git makes a merge commit with two parents.git log --onelineAfter merging, the log shows both lines of work.Your task
Join two diverged histories with a merge commit.
Open this level in your browser to type the commands at a live git prompt with an animated commit graph.