Hi! I asked a question on stackoverflow (http://stackoverflow.com/questions/4058372/git-stash-and-edited-chunks) and someone suggested it might be a bug... For convenience, I reproduce the question here: ÂI occasionally have the following problem, which is reproduced by the following sequence of commands: * git add -p my_file * IÂedit a chunk *manually*Â(usingÂe) * git stash --keep-index * git stash pop Now the problem occurs: the fileÂmy_fileÂis now considered as conflicted, and git has completely messed with my edited chunk, so I have to edit the file, remove the merge marks, and runÂgit add my_file followed byÂgit reset HEAD I'm puzzled because this happens only when editing a chunk manually. I don't see how this should make any difference at all. I'm using version 1.7.3.1 on Mac OS X. Thanks!! -- 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