TrinityCore 3.3.5 how to fix

[Djundead]

/root/TrinityCore/src/server/scripts/Custom/custom_script_loader.cpp:19:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
compilation terminated due to -Wfatal-errors.
src/server/scripts/CMakeFiles/scripts.dir/build.make:1094: recipe for target 'src/server/scripts/CMakeFiles/scripts.dir/Custom/custom_script_loader.cpp.o' failed
make[2]: *** [src/server/scripts/CMakeFiles/scripts.dir/Custom/custom_script_loader.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....
CMakeFiles/Makefile2:1598: recipe for target 'src/server/scripts/CMakeFiles/scripts.dir/all' failed
make[1]: *** [src/server/scripts/CMakeFiles/scripts.dir/all] Error 2
Makefile:127: recipe for target 'all' failed
make: *** [all] Error 2

how do i fix this?

i followed https://github.com/Rochet2/TrinityC...c/server/scripts/Custom/TransmogDisplayVendor

 

[Rochet2]

You have a merge conflict.
That means you have custom scripts already there.
You need to open the file /root/TrinityCore/src/server/scripts/Custom/custom_script_loader.cpp and then edit it so that it is as intended.
Conflicts happen when 2 changes try to edit the same place and you merge the 2 changes and git doesnt know what the correct code should be.
The <<<< >>>> ==== lines mark the part that conflicted.

You can read guides about how to solve a merge confict if you google "git resolve confict" or similar.

 

[Djundead]

yea i have figured that out already