© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
1b1ed1a
(Get the code!)
Further information: After some testing, it wasn't my user that added filename.OTHER, it was a merge process that created a context conflict. Even more so, performing the remove command on the .OTHER file should not delete both files.