widelands-dev team mailing list archive

Thread
Date

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

To: mp+192288@xxxxxxxxxxxxxxxxxx
From: GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>
Date: Mon, 03 Mar 2014 09:20:21 -0000
In-reply-to: <20131023055622.27520.44866.launchpad@ackee.canonical.com>
Reply-to: mp+192288@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Do you have any ideas how to get rid of the added/removed/deleted conflicts?

I did a full manual merge and now bzr wants to track something somewhere and is generating these conflicts.

I tried saving my work, doing a bzr merge and then copying my files over, but then I get the same conflicts directly in the branch.

I tried stuff like deleting the test and po directories and copying them over from trunk, how to I tell bzr to shut up and accept the changes already?
-- 
https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands.

References

[Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
From: SirVer, 2013-10-23