← all tinkertoys

Git merge vs rebase

Same starting point, two ways to bring main's work into your branch. Watch what happens to the history, the commit hashes, and the conflicts.

Tweak it

Break it

Normal run: the two branches touched different files, so Git combines them without asking.

What to notice