Olivier Verdier <zelbier@xxxxxxxxx> writes: > 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: Let's say the state of your working tree here is A (and last commit is HEAD). > * git add -p my_file > * I edit a chunk *manually* (using e) Here, the index contains a state which is neither in the working tree nor in the last commit. Let's call this state B. > * git stash --keep-index Here, the working tree takes state B. > * git stash pop Here, you're trying to apply the stash, which is somehow a diff between HEAD and A, on your tree which is in state B. Hence the conflicts. If you do a "git reset --hard" before the "git stash pop", you'll come back to state HEAD, and the stash will apply without conflict. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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