I don't know if it is really related, but this is how I do it (with the impconfig settings):
git clone <mangos git url> (clone mangos)
git am src/binding/scriptdev2/patch/<the latest patch> (apply scriptdev2 patch)
git remote add impconfig <impconfig's git url> (add impconfig fork)
git fetch impconfig/impconfig (download, but not apply impconfig)
git merge impconfig/impconfig (merge latest impconfig with mangos)
configure, compile, install, ??, profit? (lol)
to update:
git fetch origin
git fetch impconfig (download latest of each, but not apply yet)
git rebase impconfig/impconfig (this will start at impconfig's latest commit, then apply the latest mangos commits, then apply the scriptdev patch)
configure, compile, install, ??, profit again? (lol again)
I like git, been using it for a long time (Wine, linux kernel, etc)
This is useful if you follow the "interesting git branches" thread or have patches that you use (like scriptdev, etc) It _should_ show you when conflicts arise too, like when the scriptdev guys use a new patch etc.
I believe git-diff will show you the problem areas in this case, don't quote me on that, i don't remember exactly right off