Skip to content

docs: remove merge conflict markers from the cuda.core 1.2.0 release notes - #2518

Open
aryanputta wants to merge 1 commit into
NVIDIA:mainfrom
aryanputta:fix/release-notes-conflict-markers
Open

docs: remove merge conflict markers from the cuda.core 1.2.0 release notes#2518
aryanputta wants to merge 1 commit into
NVIDIA:mainfrom
aryanputta:fix/release-notes-conflict-markers

Conversation

@aryanputta

Copy link
Copy Markdown
Contributor

Description

cuda_core/docs/source/release/1.2.0-notes.rst on main contains unresolved merge conflict markers at lines 28, 37 and 46:

<<<<<<< HEAD
- The default-stream singletons ...
=======
- :meth:`Linker.which_backend` ...
>>>>>>> origin/main

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 #2485 default-stream bullet and the #2409 nvJitLink bullet from d9da44221 were left unresolved against each other.

Why CI did not catch it

Two reasons, both worth knowing:

  • The check-merge-conflict pre-commit hook only reports markers while the repository is mid-merge. A commit that records the markers as ordinary content passes it.
  • RST renders the markers as literal text rather than failing the Sphinx build, so Docs / Build docs stayed 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.rst passes, and the file no longer matches <<<<<<<, ======= or >>>>>>>.

Both bullets are kept; only the <<<<<<<, ======= and >>>>>>> lines
are removed.

Signed-off-by: Aryan <aryansputta@gmail.com>
@copy-pr-bot

copy-pr-bot Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

@github-actions github-actions Bot added the cuda.core Everything related to the cuda.core module label Aug 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cuda.core Everything related to the cuda.core module

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant