stderr:
M data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua
M data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua
M data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua
M data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua
M data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua
M data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua
M data/tribes/buildings/productionsites/atlanteans/smokery/init.lua
M data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua
M data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua
M data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua
M data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua
M data/tribes/buildings/productionsites/barbarians/big_inn/init.lua
M data/tribes/buildings/productionsites/barbarians/coalmine/init.lua
M data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua
M data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua
M data/tribes/buildings/productionsites/barbarians/goldmine/init.lua
M data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua
M data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua
M data/tribes/buildings/productionsites/barbarians/granitemine/init.lua
M data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua
M data/tribes/buildings/productionsites/barbarians/inn/init.lua
M data/tribes/buildings/productionsites/barbarians/ironmine/init.lua
M data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua
M data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua
M data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua
M data/tribes/buildings/productionsites/barbarians/tavern/init.lua
M data/tribes/buildings/productionsites/barbarians/warmill/init.lua
M data/tribes/buildings/productionsites/empire/armorsmithy/init.lua
M data/tribes/buildings/productionsites/empire/coalmine/init.lua
M data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua
M data/tribes/buildings/productionsites/empire/goldmine/init.lua
M data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua
M data/tribes/buildings/productionsites/empire/inn/init.lua
M data/tribes/buildings/productionsites/empire/ironmine/init.lua
M data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua
M data/tribes/buildings/productionsites/empire/marblemine/init.lua
M data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua
M data/tribes/buildings/productionsites/empire/smelting_works/init.lua
M data/tribes/buildings/productionsites/empire/tavern/init.lua
M data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua
M data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua
M data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua
M data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua
M data/tribes/buildings/productionsites/frisians/coalmine/init.lua
M data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua
M data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua
M data/tribes/buildings/productionsites/frisians/furnace/init.lua
M data/tribes/buildings/productionsites/frisians/goldmine/init.lua
M data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua
M data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua
M data/tribes/buildings/productionsites/frisians/ironmine/init.lua
M data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua
M data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua
M data/tribes/buildings/productionsites/frisians/recycling_center/init.lua
M data/tribes/buildings/productionsites/frisians/rockmine/init.lua
M data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua
M data/tribes/buildings/productionsites/frisians/sewing_room/init.lua
M data/tribes/buildings/productionsites/frisians/smokery/init.lua
M data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua
M data/tribes/buildings/productionsites/frisians/tavern/init.lua
M data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua
M data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua
M data/tribes/buildings/trainingsites/empire/arena/init.lua
M data/tribes/buildings/trainingsites/empire/colosseum/init.lua
M data/tribes/buildings/trainingsites/frisians/training_arena/init.lua
M data/tribes/scripting/help/ware_help.lua
M data/txts/developers.json
M src/logic/map_objects/tribes/production_program.cc
M src/logic/map_objects/tribes/worker.cc
Text conflict in data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua
Text conflict in data/tribes/buildings/productionsites/barbarians/big_inn/init.lua
Text conflict in data/tribes/buildings/productionsites/empire/armorsmithy/init.lua
Text conflict in data/tribes/buildings/productionsites/empire/marblemine/init.lua
4 conflicts encountered.
Error merging this proposal:
Output:
stdout:
stderr: buildings/ productionsites /atlanteans/ armorsmithy/ init.lua buildings/ productionsites /atlanteans/ coalmine/ init.lua buildings/ productionsites /atlanteans/ crystalmine/ init.lua buildings/ productionsites /atlanteans/ goldmine/ init.lua buildings/ productionsites /atlanteans/ ironmine/ init.lua buildings/ productionsites /atlanteans/ smelting_ works/init. lua buildings/ productionsites /atlanteans/ smokery/ init.lua buildings/ productionsites /atlanteans/ toolsmithy/ init.lua buildings/ productionsites /atlanteans/ weaponsmithy/ init.lua buildings/ productionsites /atlanteans/ weaving_ mill/init. lua buildings/ productionsites /barbarians/ ax_workshop/ init.lua buildings/ productionsites /barbarians/ big_inn/ init.lua buildings/ productionsites /barbarians/ coalmine/ init.lua buildings/ productionsites /barbarians/ coalmine_ deep/init. lua buildings/ productionsites /barbarians/ coalmine_ deeper/ init.lua buildings/ productionsites /barbarians/ goldmine/ init.lua buildings/ productionsites /barbarians/ goldmine_ deep/init. lua buildings/ productionsites /barbarians/ goldmine_ deeper/ init.lua buildings/ productionsites /barbarians/ granitemine/ init.lua buildings/ productionsites /barbarians/ helmsmithy/ init.lua buildings/ productionsites /barbarians/ inn/init. lua buildings/ productionsites /barbarians/ ironmine/ init.lua buildings/ productionsites /barbarians/ ironmine_ deep/init. lua buildings/ productionsites /barbarians/ ironmine_ deeper/ init.lua buildings/ productionsites /barbarians/ smelting_ works/init. lua buildings/ productionsites /barbarians/ tavern/ init.lua buildings/ productionsites /barbarians/ warmill/ init.lua buildings/ productionsites /empire/ armorsmithy/ init.lua buildings/ productionsites /empire/ coalmine/ init.lua buildings/ productionsites /empire/ coalmine_ deep/init. lua buildings/ productionsites /empire/ goldmine/ init.lua buildings/ productionsites /empire/ goldmine_ deep/init. lua buildings/ productionsites /empire/ inn/init. lua buildings/ productionsites /empire/ ironmine/ init.lua buildings/ productionsites /empire/ ironmine_ deep/init. lua buildings/ productionsites /empire/ marblemine/ init.lua buildings/ productionsites /empire/ marblemine_ deep/init. lua buildings/ productionsites /empire/ smelting_ works/init. lua buildings/ productionsites /empire/ tavern/ init.lua buildings/ productionsites /empire/ weaponsmithy/ init.lua buildings/ productionsites /frisians/ armor_smithy_ large/init. lua buildings/ productionsites /frisians/ armor_smithy_ small/init. lua buildings/ productionsites /frisians/ blacksmithy/ init.lua buildings/ productionsites /frisians/ coalmine/ init.lua buildings/ productionsites /frisians/ coalmine_ deep/init. lua buildings/ productionsites /frisians/ drinking_ hall/init. lua buildings/ productionsites /frisians/ furnace/ init.lua buildings/ productionsites /frisians/ goldmine/ init.lua buildings/ productionsites /frisians/ goldmine_ deep/init. lua buildings/ productionsites /frisians/ honey_bread_ bakery/ init.lua buildings/ productionsites /frisians/ ironmine/ init.lua buildings/ productionsites /frisians/ ironmine_ deep/init. lua buildings/ productionsites /frisians/ mead_brewery/ init.lua buildings/ productionsites /frisians/ recycling_ center/ init.lua buildings/ productionsites /frisians/ rockmine/ init.lua buildings/ productionsites /frisians/ rockmine_ deep/init. lua buildings/ productionsites /frisians/ sewing_ room/init. lua buildings/ productionsites /frisians/ smokery/ init.lua buildings/ productionsites /frisians/ tailors_ shop/init. lua buildings/ productionsites /frisians/ tavern/ init.lua buildings/ trainingsites/ atlanteans/ dungeon/ init.lua buildings/ trainingsites/ barbarians/ battlearena/ init.lua buildings/ trainingsites/ empire/ arena/init. lua buildings/ trainingsites/ empire/ colosseum/ init.lua buildings/ trainingsites/ frisians/ training_ arena/init. lua scripting/ help/ware_ help.lua developers. json map_objects/ tribes/ production_ program. cc map_objects/ tribes/ worker. cc buildings/ productionsites /atlanteans/ toolsmithy/ init.lua buildings/ productionsites /barbarians/ big_inn/ init.lua buildings/ productionsites /empire/ armorsmithy/ init.lua buildings/ productionsites /empire/ marblemine/ init.lua
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/tribes/
M data/txts/
M src/logic/
M src/logic/
Text conflict in data/tribes/
Text conflict in data/tribes/
Text conflict in data/tribes/
Text conflict in data/tribes/
4 conflicts encountered.