Comment by lillecarl

I suggest you check out git-imerge, it's a quite handy tool for making complex/big merges simple.