merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT #3482
Conversation
|
I had initially implemented this as an integer count - if we hit /cc @vmg |
include/git2/errors.h
Outdated
There was a problem hiding this comment.
Odd alignment, did you use a tab instead of spaces here?
Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which will stop on the first conflict and fail the merge operation with GIT_EMERGECONFLICT.
ethomson
force-pushed
the
merge_fail_on_conflict
branch
from
16d4aeb to
8683d31
Compare
There was a problem hiding this comment.
Would this change (and the equivalent below) make the other users of merge_trees_from_branches() and _commits_ to stop making sure that the merge succeeded? Other users should be changed to wrap their call in cl_git_pass() since we don't anymore, no?
There was a problem hiding this comment.
Yes, sorry that's subtle. Other users had already been asserting success here (wrapping their calls in cl_git_pass). That was sort of silly as those calls could never fail, but there it is.
There was a problem hiding this comment.
Ok, just wanted to make sure this ramification had been considered.
|
You're an 👼 @ethomson |
merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT
3 participants
Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which
will stop on the first conflict and fail the merge operation with
GIT_EMERGECONFLICT.