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. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
