> git complains that somewhere around commit 4 there's a conflict.

That sounds like a rebase merge, which might be the setting in the repo. A normal merge wouldn't attempt commit by commit.