Junio C Hamano <gits...@pobox.com> writes:

> ...  So "resolve the conflicts" is assuming the intention of
> the user who issued "pop" too much (let alone "manually"---it does
> not matter how the user resolves conflicts---the only thing we want
> to say is Git did all it would and no further automated help in
> resolving is availble, but "manually" is not quite the word).


> "The stash was not dropped" is the most important thing in your
> additional text.  How about rephrasing like this?
>     $ git stash pop
>     Auto-merging foo.txt
>     CONFLICT (content): Merge conflict in foo.txt
>     The stashed change could not be replayed cleanly, leaving
>     conflicts in the working tree. The stash was not dropped in case
>     you need it again.
>     After you are done with the stash, you may want to "git stash
>     drop" to discard it.


-- Stephe
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

Reply via email to