GOMove unnable to apply diff

Rochet2 / TrinityCore

Rochet2's stuff for TC

https://rochet2.github.io

89 stars 144 forks source link

GOMove unnable to apply diff #155

Closed Strajkus closed 6 months ago

Strajkus commented 6 months ago

Hi, I spend over a day trying to get GOMove working on my server.

Direct merge resulted in "Fatal error LNK1181 ..\scripts\RelWithDebInfo\scripts.lib"

And diff i am not even able to apply:

I have already installed DressNPC and Transmog without any issue whatsover.

Its 3.3.5a

Rochet2 commented 6 months ago

The diff does not apply because of the other custom scripts you have edit the same places (custom_script_loader) You need to for example use git apply --reject and manually fix the failing parts because git does not know how to solve the modifications needed to the changed code.

Strajkus commented 6 months ago

That did the trick. Thanks :)