Order of merges and the appearance of the revision history

[Joseph Wakeling]

Nicholas Allen wrote:
> I'm so glad Bazaar does it the way it does. I really dislike the systems
> where you have to interactively resolve the conflicts as you merge. It's
> much nicer to see them all at once and take your time fixing them before
> deciding to commit the merge (if at all).

I'm not talking about automation of the conflict resolution process, I
just mean that with git, the pull command won't fall over if the two
branches have diverged---it automatically performs a merge.  Any
conflicts are left to be resolved manually, as I recall.