Comment 4 for bug 113809
Revision history for this message
| Nicholas Allen (nick-allen) wrote Re: complains about conflicts in figments of its own imagination | #4 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
0e1f616
(Get the code!)
Shouldn't bzr check that you don't try to add conflict marker files. It could at least give a warning in this case because 99.9999% of the time this will be user error and the conflict marker files should not be added and committed.