Some Git Help Please

[Auntie Mangos]

After applying all the patches you should do a commit to save all the changes to your local copy. When you do a git pull that should merge the changes with your local copy. Of course any conflicts will still need to be fixed. I prefer Kdiff3 as my mergetool, but there are several others that will work just as well. If your mergetool is setup properly you can run "git mergetool" to go through and fix any conflicts.

I found the post at http://getmangos.eu/community/viewtopic.php?id=4276 to be quite helpful in getting everything setup. Hope this helps.

[phelpsben]

I have a super patched MaNGOS (wen't through under review and add alot of those to my source).

How can I update my mangos revision without needing to reapply ALL these patches ?

I'm using linux also.

[Patman128]

If you pull it and the automerge fails, it will always leave the files with all the information you need inside of them. Find which files need manual merging, open them, and search for <<<<<. Once its all done, add the files and commit them all.

[phelpsben]

I just applied all the patches by hand as most them wouldn't work.

Is there any way I can update with git ?