On Mon, Mar 1, 2010 at 22:29, Sylvain Rabot <sylvain@xxxxxxxxxxxxxx> wrote: > On Mon, 2010-03-01 at 18:12 +0100, Heiko Voigt wrote: >> On Fri, Feb 19, 2010 at 12:11:57AM +0100, Sylvain Rabot wrote: >> > 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. >> >> I do not see anything missing. After resolving a conflict you usually >> just need to add the files (in git gui click on the icon of the file). >> Am I missing something? This is the usual conflict resolution workflow >> for git, I see no need for an extra menu option. >> >> cheers Heiko > > Haaaaaaa, I don't know how many times I tried to do a right click on the > path itself but I never had the idea to click the icon :P Actually, I would like to be able to have a right click menu for the path too and have access to the guitool entries in the Tools menu which require a path (ie. needsfile=true). That would reduce by mouse movements drastically. I have looked into this issue by myself, but I'm not that familiar with tcl/tk. Bert -- 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