|Subject:||bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file|
|Date:||Wed, 13 May 2015 02:13:10 +0300|
|User-agent:||Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0|
Bad news, everyone!When a stash contains changes for several files, and "stash pop" encounters conflicts only in some of them, the rest of the files are stages automatically.
At least, that happens with Git 2.1.0 on my machine, and some commenters here: http://stackoverflow.com/a/1237337/615245
So then when we unstage the files which had conflicts after resolving those, the result is mixed. Which doesn't look right.
What shall we do? Unstage the automatically-staged files? Revert the changes from this bug? It seems Git really wants the changes staged after the conflict resolution.
|[Prev in Thread]||Current Thread||[Next in Thread]|