Hi, In case of conflicts it is possible in git gui, through the right click menu, to use local or remote versions, but, unless I missed something, it is not possible, after using the merge tool, to add merged files to the index. It would be nice if we could add merged files in the index directly in git gui. Besides, having this third option will avoid the mistake I used to make when I was a git beginner, knowing, after using the merge tools I was using the "use local version" options thinking it will add to the index the local changes I just made to the conflicted file. Regards. -- Sylvain -- 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