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_clang_codecheck' failed. Output:

-D  cmake/codecheck/rules/illegal_space_after_opening_brace
-D  cmake/codecheck/rules/line_starting_with_space_followed_by_control_structure
-D  cmake/codecheck/rules/missing_padding
-D  cmake/codecheck/rules/space_as_indentation
 M  cmake/codecheck/rules/upcast_without_macro
 M  src/ai/defaultai.cc
 M  src/editor/tools/editor_tool.h
 M  src/graphic/text/rt_errors.h
 M  src/io/filesystem/layered_filesystem.h
 M  src/io/filesystem/zip_filesystem.h
 M  src/logic/map_objects/immovable.h
 M  src/logic/map_objects/tribes/carrier.h
 M  src/logic/map_objects/tribes/constructionsite.h
 M  src/logic/map_objects/tribes/dismantlesite.h
 M  src/logic/map_objects/tribes/militarysite.cc
 M  src/logic/map_objects/tribes/militarysite.h
 M  src/logic/map_objects/tribes/soldier.h
 M  src/logic/map_objects/tribes/trainingsite.h
 M  src/logic/map_objects/tribes/warehouse.h
 M  src/logic/map_objects/world/map_gen.h
 M  src/logic/player.h
 M  src/map_io/s2map.h
 M  src/network/nethost.cc
 M  src/scripting/lua_map.cc
Text conflict in src/map_io/s2map.h
1 conflicts encountered.

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