chore(backport): create prs with conflict markers for visibility #3437
+2
−1
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
Backport failures previously aborted silently, requiring log diving to understand which files conflicted. With commitConflicts enabled, PRs are created with conflict markers visible in the diff, letting reviewers gauge resolution effort at a glance. Addresses OPS-461
sydorovdmytro
approved these changes
Jan 8, 2026
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.
References OPS-461
Note
Enables visibility into merge conflicts during backports.
commitConflicts: trueto.backportrc.jsonso backport PRs include conflict markersprDescriptiontemplate and branch mappingWritten by Cursor Bugbot for commit 52f44b5. This will update automatically on new commits. Configure here.