Synth
Exalted Member
Hello,Emudevs!
So actually today i was going to update my core after adding many scripts,so first i just do git pull,it ask me for commit,then i write git add -A,then git commit -a -m "My Commit Message",after that i get this:
Git result need me to merge,then i just right click in my core folder then i click Gitcommit and i select player.h that i need to merge it i click merge then it take me here:
Here,so the problem i didn't know how i can slove merge conflicts,so i try different way to slove it but i get compile errors and it remove my scripts that need core modifications like transmog,my goal is to pull and ofc don't change my core modifications that i do it.
Thank you!
Best regards,
Synth!
So actually today i was going to update my core after adding many scripts,so first i just do git pull,it ask me for commit,then i write git add -A,then git commit -a -m "My Commit Message",after that i get this:
Git result need me to merge,then i just right click in my core folder then i click Gitcommit and i select player.h that i need to merge it i click merge then it take me here:
Here,so the problem i didn't know how i can slove merge conflicts,so i try different way to slove it but i get compile errors and it remove my scripts that need core modifications like transmog,my goal is to pull and ofc don't change my core modifications that i do it.
Thank you!
Best regards,
Synth!
