Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH] revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:52:12

Jay Soffian [off-list ref] writes:
For that matter, I don't see how to distinguish "the merge did not
even start" from "the merge had conflicts" when using
try_merge_command().
I suspect you figured it out by now (sorry I have been tending other
topics and general project maintenance issues), but in case you haven't,
the exit values from the strategy backends are returned straight back to
the caller. The strategy backends are supposed to exit with 1 when they
left the conflicts, and 2 when they punted and did not touch the index nor
the working tree.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help