← Back to team overview

widelands-dev team mailing list archive

Thread
Date

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

To: mp+280192@xxxxxxxxxxxxxxxxxx
From: TiborB <tiborb95@xxxxxxxxx>
Date: Fri, 11 Dec 2015 21:23:03 -0000
In-reply-to: <20151210201824.4261.11450.launchpad@ackee.canonical.com>
Reply-to: mp+280192@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

> BTW you can get rid of the merge conflict if you run utils/fix_lua_tabs.py

I currently have no conflicts on local repo. Should I first merge trunk or run this python script?
-- 
https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai_ship_tweaks into lp:widelands.

References

[Merge] lp:~widelands-dev/widelands/ai_ship_tweaks into lp:widelands
From: TiborB, 2015-12-10