Order of merges and the appearance of the revision history

Nicholas Allen allen at ableton.com
Wed Apr 25 14:07:22 BST 2007


>
> In many other systems there is no "merge + commit" doing the "merge"
> automatically commits if there are no textual conflicts. We don't.
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). CVS and SVN at least got this 
concept right. Monotone, SCCS and other distributed VCS do it 
interactively but Bazaar's way is far superior ;-)

Nick



More information about the bazaar mailing list