widelands-dev team mailing list archive

[bunnybot <widelandsofficial@xxxxxxxxx>]

Error merging this proposal:

Output:
stdout:

stderr:
+N  data/tribes/buildings/markets/
+N  data/tribes/buildings/markets/barbarians/
+N  data/tribes/buildings/markets/barbarians/market/
+N  data/tribes/buildings/markets/barbarians/market/build_00.png
+N  data/tribes/buildings/markets/barbarians/market/helptexts.lua
+N  data/tribes/buildings/markets/barbarians/market/idle_00.png
+N  data/tribes/buildings/markets/barbarians/market/idle_00_pc.png
+N  data/tribes/buildings/markets/barbarians/market/init.lua
+N  data/tribes/buildings/markets/barbarians/market/menu.png
+N  src/logic/map_objects/tribes/market.cc
+N  src/logic/map_objects/tribes/market.h
+N  test/maps/market_trading.wmf/
+N  test/maps/market_trading.wmf/binary/
+N  test/maps/market_trading.wmf/binary/heights
+N  test/maps/market_trading.wmf/binary/mapobjects
+N  test/maps/market_trading.wmf/binary/resource
+N  test/maps/market_trading.wmf/binary/terrain
+N  test/maps/market_trading.wmf/elemental
+N  test/maps/market_trading.wmf/minimap.png
+N  test/maps/market_trading.wmf/objective
+N  test/maps/market_trading.wmf/player_names
+N  test/maps/market_trading.wmf/player_position
+N  test/maps/market_trading.wmf/port_spaces
+N  test/maps/market_trading.wmf/scripting/
+N  test/maps/market_trading.wmf/scripting/init.lua
+N  test/maps/market_trading.wmf/scripting/test_market_can_be_build.lua
+N  test/maps/market_trading.wmf/version
 M  data/tribes/barbarians.lua
 M  data/tribes/init.lua
 M  data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua
 M  data/tribes/scripting/starting_conditions/barbarians/headquarters.lua
 M  data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua
 M  doc/sphinx/extract_rst.py
 M  regression_test.py
 M  src/logic/CMakeLists.txt
 M  src/logic/map_objects/map_object.cc
 M  src/logic/map_objects/map_object.h
 M  src/logic/map_objects/tribes/productionsite.cc
 M  src/logic/map_objects/tribes/productionsite.h
 M  src/logic/map_objects/tribes/tribes.cc
 M  src/logic/map_objects/tribes/tribes.h
 M  src/scripting/lua_map.cc
 M  src/scripting/lua_map.h
 M  src/scripting/lua_root.cc
 M  src/scripting/lua_root.h
 M  src/website/map_object_info.cc
 M  src/wui/interactive_gamebase.cc
 M  test/maps/lua_testsuite.wmf/scripting/tribes_descriptions.lua
Conflict adding file src/logic/map_objects/tribes/market.cc.  Moved existing file to src/logic/map_objects/tribes/market.cc.moved.
Conflict adding file test/maps/market_trading.wmf.  Moved existing file to test/maps/market_trading.wmf.moved.
2 conflicts encountered.


-- 
https://code.launchpad.net/~widelands-dev/widelands/market/+merge/330830
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/market.