widelands-dev team mailing list archive

Thread
Date

Re: [Merge] lp:~widelands-dev/widelands/filesystem-errors into lp:widelands

To: mp+358219@xxxxxxxxxxxxxxxxxx
From: kaputtnik <somal@xxxxxxxx>
Date: Mon, 12 Nov 2018 17:06:13 -0000
In-reply-to: <154115714268.28084.6093421683359771415.launchpad@ackee.canonical.com>
Reply-to: mp+358219@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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
-- 
https://code.launchpad.net/~widelands-dev/widelands/filesystem-errors/+merge/358219
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/filesystem-errors.

References

[Merge] lp:~widelands-dev/widelands/filesystem-errors into lp:widelands
From: Arty, 2018-11-02