Skip to content

Update the backporting docs #100401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 24, 2024
Merged

Update the backporting docs #100401

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
593f763
Update the backporting docs
AaronBallman Jul 24, 2024
c9b9257
Update llvm/docs/GitHub.rst
AaronBallman Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions llvm/docs/GitHub.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,10 +376,10 @@ Releases

Backporting Fixes to the Release Branches
-----------------------------------------
You can use special comments on issues to make backport requests for the
release branches. This is done by making a comment containing the following
command on any issue that has been added to one of the "X.Y.Z Release"
milestones.
You can use special comments on issues or pull requests to make backport
requests for the release branches. This is done by making a comment containing
the following command on any issue or pull request that has been added to one
of the "X.Y.Z Release" milestones.

::

Expand All @@ -388,8 +388,8 @@ milestones.
This command takes one or more git commit hashes as arguments and will attempt
to cherry-pick the commit(s) to the release branch. If the commit(s) fail to
apply cleanly, then a comment with a link to the failing job will be added to
the issue. If the commit(s) do apply cleanly, then a pull request will
be created with the specified commits.
the issue/pull request. If the commit(s) do apply cleanly, then a pull request
will be created with the specified commits.

If a commit you want to backport does not apply cleanly, you may resolve
the conflicts locally and then create a pull request against the release
Expand Down
Loading