Stephen Leake <stephen_le...@stephe-leake.org> writes:
> Matthieu Moy <matthieu....@grenoble-inp.fr> writes:
>> li...@haller-berlin.de (Stefan Haller) writes:
>>> Your intention was clearly to drop the stash, it just wasn't dropped
>>> because of the conflict. Dropping it automatically once the conflict
>>> is resolved would be nice.
>> Your intention when you ran "git stash pop", yes. Your intention when
>> you ran "git add", I call that guessing.
> You might be adding other files for other reasons. But if you add a file
> that does resolve a conflict caused by 'git stash pop', it is not
The only thing you know for sure is that the user has consumed _one_
part of the stashed change, no? What if the stash had changes for
more than one path?
At the time of "git add $path", can you reliably tell if the
conflict to the $path the user is resolving came from a previous
"git stash pop", not from any other mergy operations, e.g. "git
stash apply" or "git apply -3"?
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html