© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
513534c
demo site
(Get the code!)
What about the case if both files are versioned? I merged an SVN branch into an identical Bazaar branch and got tons of conflicts. I think such conflicts should be handled automatically as well.