search

Rochet2 / TrinityCore

Rochet2's stuff for TC
https://rochet2.github.io
90 stars 143 forks source link

Trying to apply .diff #140

Open Slipy007 opened 2 years ago

Slipy007 commented 2 years ago

Hi,

I'm trying to apply diff file to my pre compile and I get this error. I'm using latest trinitycore 3.3.5a I pulled and right clicked link to save file as and place it in my core folder. I'm trying to use the Transmog - Blizzlike https://imgur.com/iEFFnfb

Rochet2 commented 2 years ago

Merging succeeded 10 hours ago and there has not been any commits in 15 hours, so I dont expect the patch to be outdated. Make sure you are on 3.3.5 branch of TC. Also note that any other edits or patches to your core can interfere with the patch. If you are using multiple patches, you likely need to manually apply the parts that cannot be applied automatically.

Take a look at git apply --reject

Slipy007 commented 2 years ago

Merging succeeded 10 hours ago and there has not been any commits in 15 hours, so I dont expect the patch to be outdated. Make sure you are on 3.3.5 branch of TC. Also note that any other edits or patches to your core can interfere with the patch. If you are using multiple patches, you likely need to manually apply the parts that cannot be applied automatically.

Take a look at git apply --reject

Oh ok, yes I'm using TrinityBots, I'll manually add the .diff

thank you