widelands-dev team mailing list archive
Mailing list archive
Re: [Merge] lp:~widelands-dev/widelands/filesystem-errors into lp:widelands
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
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/filesystem-errors.