widelands-dev team mailing list archive

[bunnybot <widelandsofficial@xxxxxxxxx>]

Bunnybot encountered an error while working on this merge proposal:

Running 'bzr merge ../_widelands_dev_widelands_ai_ship_tweaks' failed. Output:

+N  src/game_io/game_player_ai_persistent_packet.cc
+N  src/game_io/game_player_ai_persistent_packet.h
+N  test/maps/ship_transportation.wmf/scripting/test_many_ships.lua
 M  src/ai/ai_help_structs.h
 M  src/ai/defaultai.cc
 M  src/ai/defaultai.h
 M  src/game_io/CMakeLists.txt
 M  src/game_io/game_data_packet.h
 M  src/game_io/game_loader.cc
 M  src/game_io/game_player_info_packet.cc
 M  src/game_io/game_saver.cc
 M  src/logic/map_objects/tribes/ship.cc
 M  src/logic/map_objects/tribes/ship.h
 M  src/logic/map_objects/tribes/tribe_descr.cc
 M  src/logic/map_objects/tribes/tribe_descr.h
 M  src/logic/player.cc
 M  src/logic/player.h
 M  src/map_io/map_allowed_building_types_packet.cc
 M  src/scripting/lua_map.cc
 M  src/scripting/lua_map.h
 M  src/wui/shipwindow.cc
 M  tribes/atlanteans.lua
 M  tribes/barbarians.lua
 M  tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua
 M  tribes/buildings/trainingsites/empire/colosseum/init.lua
 M  tribes/empire.lua
Text conflict in src/ai/defaultai.cc
1 conflicts encountered.

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