I've now worked a while with the latest git-gui that includes the capability to run a merge tool, and I must say that there is room for improvement. I greatly appreciate that a merge tool can be invoked. This is really helpful. But... I've nevertheless two *big* issues with that: 1. The inability to stage a conflicted file by clicking the icon is *very* disruptive. The new menu entry "Stage Working Copy" is really only a workaround, and it shows. 2. The fact that a file was automatically staged after the merge tool was exited has caused headaches that the merge tool should actually cure. Because of this behavior, I could not postpone a conflict resolution once I have started the merge tool, nor can I re-run the tool if I forgot to resolve a conflict. This patch series addresses these issues. Furthermore, the operations "Use local version" and "Use remote version" could be much more useful. They could serve as "merge shortcuts": These operations should only use the "local" or "remote" part inside the conflict markers, and not also reset the part that is not visible. In the current form I found them useful only in the modify/delete conflict cases, where I picked the "delete" part. HTH, -- Hannes -- 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
