On Fri, Nov 14, 2008 at 01:25:12PM +0000, Charles Bailey wrote: > Previously, if you aborted a merge, you were left with the > base/local/remote temporaries for the merge that you aborted. > > To be honest, I found this a little irritating. The base, local and > remote temporaries are inputs so are accessible from slots 1,2 and 3 of > the index, and any intermediate output will be in the target file. You > can git clean, but if you have other temporaries you need to keep, you > end up having to manually clean them up in any case. > > With --keep-going, the problem is compounded. If you make several passes > through a list of complex merges you end up with fistfuls of these > temporary trios in your working tree. It goes from slightly annoying to > very irritating. I agree; I have never found the temporary files left by mergetool from a failed merge to be useful, and get a little annoyed that I have to "git clean" them away afterwards. Even without --keep-going, I would often look at and abort a merge several times before resolving it and end up with several copies. But I definitely think that is an issue for a separate patch, and one that needs input from Ted and from other mergetool users. -Peff -- 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
