just fyi: We did some more hacking on properly merging this branch yesterday.
The result can be found in lp:~widelands-dev/widelands/i18n - that is the
branch that we are going to merge on wednesday.
This merge request is therefore kinda outdated.
--
https://code.launchpad.net/~widelands-dev/w
Try to ping emptty on IRC. He'll likely be able to answer (and maybe even add
the patch upstream). :)
--
https://code.launchpad.net/~qcumber-some/widelands/bug1287241/+merge/209091
Your team Widelands Developers is requested to review the proposed merge of
lp:~qcumber-some/widelands/bug1287241 i
* Source Package: widelands
* Version: 1:18-ppa0-bzr6843-201403031534~ubuntu12.04.1
* Architecture: i386
* Archive: widelands-dev-widelands-daily-precise PPA
* Component: main
* State: Failed to build
* Duration: 9 minutes
* Build Log:
https://launchpad.net/~widelands-dev/+archive/widelan
Jens Beyer (Qcumber-some) has proposed merging
lp:~qcumber-some/widelands/bug1287241 into lp:~widelands-dev/widelands/debian.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1287241 in widelands: "Parallel compilation on launchpad builder is
broken"
https://bugs.
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 di
5 matches
Mail list logo
