widelands-dev team mailing list archive

Thread
Date

Re: [Merge] lp:~tiborb95/widelands/tiborb-ai into lp:widelands

To: Tibor Bamhor <tiborb95@xxxxxxxxx>
From: Tibor Bamhor <tiborb95@xxxxxxxxx>
Date: Fri, 16 May 2014 06:24:40 -0000
In-reply-to: <20140515192032.3497.78145.launchpad@ackee.canonical.com>
Reply-to: mp+219750@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

I have to learn first how to deal with conflicts. Does it mean that somebody has changed those two files in the trunk since I made own branch? Are those conflicts visible in the diffs here? What color are they? By my understanding, these two files have to be flatly replaced... or do I need just merge trunk to my branch? 

Well it would be commitment for me if it is merged, because this needs polish. I want to get this changes into release-level quality within 1-3 months. Also next release is probably still far ahead...


-- 
https://code.launchpad.net/~tiborb95/widelands/tiborb-ai/+merge/219750
Your team Widelands Developers is requested to review the proposed merge of lp:~tiborb95/widelands/tiborb-ai into lp:widelands.

References

[Merge] lp:~tiborb95/widelands/tiborb-ai into lp:widelands
From: Tibor Bamhor, 2014-05-15