Code review comment for lp:~widelands-dev/widelands/filesystem-errors
Revision history for this message
| kaputtnik (franku) wrote | # |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
67d34a1
(Get the code!)
No, then you will have 'diverged' branches. I had those a lot in the past... Mostly i deleted the branch and pulled it again to get a clean copy.
Merge conflicts arise if the logic of the merge command wasn't able to merge branch A into branch B. This can happen if the changes made in branch A are too complicated for the merge logic.
Try in terminal:
bzr help conflicts
bzr help conflict-types
bzr help diverged-branches