merge_tools: add merge-tool-error-status-on-conflict config option #4981
+138
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
scott2000
force-pushed
the
merge-tool-error-status-on-conflict
branch
from
5bc7b4d
to
a042e13
Compare
Some Git merge drivers can partially resolve conflicts, leaving some conflict markers in the output file. In that case, they exit with a status between 1 and 127 to indicate that there was a conflict remaining in the file. We should support this convention as well, since it will allow many Git merge drivers to be used with Jujutsu. https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver
scott2000
force-pushed
the
merge-tool-error-status-on-conflict
branch
from
a042e13
to
1b3e5cf
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some Git merge drivers can partially resolve conflicts, leaving some conflict markers in the output file. In that case, they exit with a status between 1 and 127 to indicate that there was a conflict remaining in the file. We should support this convention as well, since it will allow many Git merge drivers to be used with Jujutsu.
https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver
Checklist
If applicable:
CHANGELOG.md