Compare
Two ways to integrate
The same starting state, two integrations side by side. Look at the shape of the history, then look at the file content — the second one is the surprise.
Same files, different history
Both approaches end with an identical working tree. Only the shape of the history differs — that is the whole choice between them: not the work, but the story left behind.
tip: main
1
new commits
0
copied
0
without a card
2
parents on the tip
One new commit with two parents. Nothing is rewritten and nothing is orphaned.
tip: feature
2
new commits
2
copied
2
without a card
1
parents on the tip
Every feature commit is copied into a new object. The history goes straight; the old boxes stay on the shelf.