On Wed, 20 May 2009, Nicolas Pitre wrote: > On Wed, 20 May 2009, Junio C Hamano wrote: > > > (3) What should happen when you cannot write the index out as a tree? I > > think it is easier to make mistakes during a conflicted merge > > resolution than during a straight linear development of your own, and > > one of the cases that would benefit most would be that you have > > resolved a path to your satisfaction but then later you screw up > > while resolving some other paths, losing an earlier resolution. > > This one is tricky. Maybe storing two reflog entries corresponding to > the unresolved stages? BTW, what happens if one tries to 'git stash' an unresolved index? So far this trash reflog and git stash have quite in common, and stashing an unresolved index certainly has value too. Nicolas -- 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