widelands-dev team mailing list archive

Thread
Date

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

To: mp+332264@xxxxxxxxxxxxxxxxxx
From: Notabilis <notabilis27@xxxxxx>
Date: Sat, 25 Nov 2017 21:17:31 -0000
In-reply-to: <150792428542.30885.739076355531877540.launchpad@ackee.canonical.com>
Reply-to: mp+332264@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

No problem. As long as we have one commit for the merge the single steps aren't that important.

Seems like I am quite talented with breaking bunnybot though, sorry. So the problem was merging with the same branch? I would have thought that this is a quite normal operation for bzr and git, isn't it? What would have been the bunnybot-friendly way to merge(?) the diverged branch heads?
-- 
https://code.launchpad.net/~widelands-dev/widelands/net-uuid/+merge/332264
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/net-uuid.

References

[Merge] lp:~widelands-dev/widelands/net-uuid into lp:widelands
From: Notabilis, 2017-10-13