[llvm] a8344a9 - [llvm][docs] Reorder Stacked PR approaches in GitHub.rst (#138126)
via llvm-commits
llvm-commits at lists.llvm.org
Tue May 6 04:29:08 PDT 2025
Author: Paschalis Mpeis
Date: 2025-05-06T12:29:04+01:00
New Revision: a8344a95c789f79be373d40a6e86a6c9a80d0b21
URL: https://github.com/llvm/llvm-project/commit/a8344a95c789f79be373d40a6e86a6c9a80d0b21
DIFF: https://github.com/llvm/llvm-project/commit/a8344a95c789f79be373d40a6e86a6c9a80d0b21.diff
LOG: [llvm][docs] Reorder Stacked PR approaches in GitHub.rst (#138126)
The 'user branches' approach now appears before the 'dependency note'
approach, as it makes reviewing easier.
Add notes on requiring commit access for the former approach.
Added:
Modified:
llvm/docs/GitHub.rst
Removed:
################################################################################
diff --git a/llvm/docs/GitHub.rst b/llvm/docs/GitHub.rst
index d2652f7d94bd6..de0022e518cc8 100644
--- a/llvm/docs/GitHub.rst
+++ b/llvm/docs/GitHub.rst
@@ -254,16 +254,6 @@ To illustrate, assume that you are working on two branches in your fork of the
Your options are as follows:
-#. Two PRs with a dependency note
-
- Create PR_1 for `feature_1` and PR_2 for `feature_2`. In PR_2, include a
- note in the PR summary indicating that it depends on PR_1 (e.g.,
- “Depends on #PR_1”).
-
- To make review easier, make it clear which commits are part of the base PR
- and which are new, e.g. "The first N commits are from the base PR". This
- helps reviewers focus only on the incremental changes.
-
#. Use user branches in ``llvm/llvm-project``
Create user branches in the main repository, as described
@@ -274,8 +264,22 @@ Your options are as follows:
This approach allows GitHub to display clean, incremental
diff s for each PR
in the stack, making it much easier for reviewers to see what has changed at
- each step. Once `feature_1` is merged, you can rebase and re-target
- `feature_2` to `main`.
+ each step. Once `feature_1` is merged, GitHub will automatically rebase and
+ re-target your branch `feature_2` to `main`. For more complex stacks, you can
+ perform this step using the web interface.
+
+ This approach requires commit access. See how to obtain it
+ `here <https://llvm.org/docs/DeveloperPolicy.html#obtaining-commit-access>`_.
+
+#. Two PRs with a dependency note
+
+ Create PR_1 for `feature_1` and PR_2 for `feature_2`. In PR_2, include a
+ note in the PR summary indicating that it depends on PR_1 (e.g.,
+ “Depends on #PR_1”).
+
+ To make review easier, make it clear which commits are part of the base PR
+ and which are new, e.g. "The first N commits are from the base PR". This
+ helps reviewers focus only on the incremental changes.
#. Use a stacked PR tool
More information about the llvm-commits
mailing list