> You can let git-rerere help you to manage conflicts which might > reoccur during merges. If you create the .git/rr-cache directory > then git-commit and git-merge will automatically use git-rerere to > help you. Yes git-rerere is a black magic tool, but it works :-) Byt he way, why git-pull (or possible git-merge) does not commit the merge result after conflict was fixed by git-rerere ? - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html