Merging Origin master

[godhimself]

I was wondering how people like insider42 still manage to merge origin (insider42 merged branch 'master' of git://github.com/mangos/mangos ) after so mayn changes (custom updates) ...while I get Error SpellEffect.cpp Not up to date. after only few changes....

[Lynx3d]

By using git properly, maybe?

Sound like you're having uncommited changes, that of course prevents any merging attempts...

[DasBlub]

you can use 'git rebase' that way your patch is always on the top. honestly i haven't known that 'back then when i started', so i used 'git pull' -> i get merge errors too from time to time. then there's only one thing to do: open it in a text editor and go through it and fix it.

[kich0]

you need to have your own working git repository to do merge but before merger you must commit & push all custom changes.

[Patman128]

http://www.kernel.org/pub/software/scm/git/docs/git-merge.html