© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
bbfa235
(Get the code!)
+1
The actual 'content conflict' reflects the implementation, from a user point of view, the conflicts should be refined into more focused types which will make them easier to understand.
The main issue in adding new conflict types is backward compatibility but considering that the file is short-lived we may just want to *not* support upgrades or give the alternative: bzr revert or delete checkout/conflicts + commit.