Uh oh!
There was an error while loading. Please reload this page.
[docs-only]: remove merge conflict markers from the cuda.core 1.2.0 release notes - #2518
Closed
aryanputta wants to merge 2 commits into
Closed
[docs-only]: remove merge conflict markers from the cuda.core 1.2.0 release notes#2518aryanputta wants to merge 2 commits into
aryanputta wants to merge 2 commits into
Conversation
Both bullets are kept; only the <<<<<<<, ======= and >>>>>>> lines are removed. Signed-off-by: Aryan <aryansputta@gmail.com>
Contributor
mdboom
approved these changes
Aug 7, 2026
mdboom
enabled auto-merge (squash)
August 7, 2026 13:24
mdboom
commented
Aug 7, 2026
Contributor
/ok to test 785cb9e |
mdboom
commented
Aug 7, 2026
Contributor
I wonder how this got past pre-commit 🤔 |
auto-merge was automatically disabled
August 7, 2026 13:25
Pull request was closed
mdboom
commented
Aug 7, 2026
Contributor
Closing as already-fixed. |
|
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
Sign up for freeto 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.
Description
cuda_core/docs/source/release/1.2.0-notes.rstonmaincontains unresolved merge conflict markers at lines 28, 37 and 46:Both bullets are correct and belong in the notes. Only the three marker lines are removed; no prose is changed.
They entered in
418595b78a(#2490), where the#2485default-stream bullet and the#2409nvJitLink bullet fromd9da44221were left unresolved against each other.Why CI did not catch it
Two reasons, both worth knowing:
check-merge-conflictpre-commit hook only reports markers while the repository is mid-merge. A commit that records the markers as ordinary content passes it.Docs / Build docsstayed green.Without this they would ship verbatim in the published 1.2.0 release notes.
Testing
pre-commit run --files cuda_core/docs/source/release/1.2.0-notes.rstpasses, and the file no longer matches<<<<<<<,=======or>>>>>>>.