Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trying to apply .diff #140

Open
Slipy007 opened this issue Jun 10, 2022 · 2 comments
Open

Trying to apply .diff #140

Slipy007 opened this issue Jun 10, 2022 · 2 comments

Comments

@Slipy007
Copy link

Slipy007 commented Jun 10, 2022

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
Copy link
Owner

Rochet2 commented Jun 10, 2022

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
Copy link
Author

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants