Alex Vandiver <a...@chmrr.net> writes:
> ... "Cannot stash while resolving conflicts" or similar would be
> more understandable to the end user than the above.
Interestingly enough, the "apply" side is protected with this one
liner:
# current index state
c_tree=$(git write-tree) ||
die "$(gettext "Cannot apply a stash in the middle of a merge")"
since 5fd448f (git stash: Give friendlier errors when there is
nothing to apply, 2009-08-11). I would think something in line with
that change on the "create" side is a welcome one.
Thanks.
--
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
