merge-tools: builtin: handle conflict file as binary to disable hunk selector #6337
Conversation
This file contains hidden or 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
I'm going to add FileContents::Conflict, and the number of combinations would explode.
…selector Previously, a conflict file was materialized, and the edited content was written as a normal file. I don't think we can naturally support selecting conflict hunks with the current scm_record data model and UI, so this patch turns off the hunk-level selector. Closes jj-vcs#4963
martinvonz
reviewed
Apr 16, 2025
Oh, does that work because all resolved hunks are selected? (If some were unselected, the edited content would have materialized conflict as non-conflict text.) It might be better to parse the edited content back to conflict, then. This wouldn't always work, but should be better than the current state. |
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.
Closes #4963
Checklist
If applicable:
CHANGELOG.md