Jakub Narebski <jnareb@xxxxxxxxx> writes: >> So I think we are really on the same page. :) > > Also it would be not as easy as reflogs - you would have either to save > copy of index, or create a tree out of it and save reference in reflog. Also note that "Create a tree out of it" is not always a useful way to save the state of the index. The "stash" shares the same issue, but you would need an equivalent of a tarball that consists of the index file (with conflicted state) and the files in the working tree that corresponds to index entries with conflicted states if you want to be useful for storing a state away in case you botch the conflict resolution you are attempting. -- 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