© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
0e1f616
demo site
(Get the code!)
What I did earlier, was moving the file THIS.other to the mainfile.java (I mean database.txt or Taak.java), and after that, I removed all *.java.* and *.txt.*. So, the directory only has the conflicted file and no renamed THIS, OTHER, etc files. I thought I had to remove those files and make the main file the correct one, before calling bzr resolve mainfile.java. But then, I get those errors above.