feat(cram): detect diff3 and jujutsu conflicts #12617
Merged
+203
−4
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
Alizter
force-pushed
the
push-zrukywltvqwr
branch
from
2d1859a to
4e0a73b
Compare
rgrinberg
reviewed
Oct 24, 2025
rgrinberg
approved these changes
Oct 24, 2025
Alizter
force-pushed
the
push-zrukywltvqwr
branch
from
4e0a73b to
6961c89
Compare
Signed-off-by: Ali Caglayan <[email protected]>
Alizter
force-pushed
the
push-zrukywltvqwr
branch
from
6961c89 to
8b96fb0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
We add support for both diff3 and jujutsu conflict markers to the conflict detection added in #12538.