TrinityCore icon indicating copy to clipboard operation
TrinityCore copied to clipboard

Trying to apply .diff

Open Slipy007 opened this issue 3 years ago • 2 comments

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

Slipy007 avatar Jun 10 '22 05:06 Slipy007

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

Rochet2 avatar Jun 10 '22 10:06 Rochet2

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

Slipy007 avatar Jun 10 '22 11:06 Slipy007