Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge_tools: add merge-tool-error-status-on-conflict config option #4981

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

merge_tools: add merge-tool-error-status-on-conflict config option #4981

wants to merge 1 commit into from
+138 −5

Commits on Nov 26, 2024

  1. merge_tools: add merge-tool-error-status-on-conflict 

    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
    scott2000 committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    1b3e5cf View commit details
    Browse the repository at this point in the history