oui, voilà alors j’ai:
Removing contrib/git/rev_id.cmdRemoving contrib/git/rev_id.sh
Removing sql/CMakeLists.txt
Auto-merging sql/old/3.3.5a/2011_04_27_00_world_spell_script_names.sql
Auto-merging sql/old/3.3.5a/2011_05_06_01_world_spell_proc_event.sql
Auto-merging sql/old/3.3.5a/2011_05_28_00_world_sai.sql
Removing sql/updates/world/2011_03_12_00_world_creature_template.sql
Auto-merging src/server/game/CMakeLists.txt
Auto-merging src/server/game/Entities/Player/Player.cpp
Auto-merging src/server/game/Entities/Player/Player.h
Auto-merging src/server/game/Entities/Unit/Unit.cpp
CONFLICT (content): Merge conflict in src/server/game/Entities/Unit/Unit.cpp
Auto-merging src/server/game/Scripting/ScriptLoader.cpp
Auto-merging src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
Auto-merging src/server/game/Spells/SpellEffects.cpp
Auto-merging src/server/game/World/World.cpp
Auto-merging src/server/game/World/World.h
Auto-merging src/server/scripts/CMakeLists.txt
Auto-merging src/server/scripts/Commands/CMakeLists.txt
Removing src/server/scripts/EasternKingdoms/dun_morogh.cpp
Removing src/server/scripts/EasternKingdoms/elwynn_forest.cpp
Auto-merging src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
Auto-merging src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
Removing src/server/scripts/World/boss_emeriss.cpp
Removing src/server/scripts/World/boss_lethon.cpp
Removing src/server/scripts/World/boss_taerar.cpp
Removing src/server/scripts/World/boss_ysondre.cpp
Removing src/server/shared/Database/SQLStorage.cpp
Removing src/server/shared/Database/SQLStorage.h
Removing src/server/shared/Database/SQLStorageImpl.h
Auto-merging src/server/worldserver/worldserver.conf.dist
Automatic merge failed; fix conflicts and then commit the result.
Je suis sous linux.
S’il vous plaît aidez moi a résoudre ce problème…