Bye Bye Subversion. Hello Bazaar.
bzr branch http://intuitive-desktop.org/bzr/main/
Merging is SOOOOO much easier in Bazaar.
Also. I stumbled over a tool called Meld Diff that is very useful when you need to perform complex merges that can’t be performed automatically.
Look at the pic. You can click the little arrows to merge each section, one-by-one.
Post a Comment