Skip to content

Commit 8b3cdb4

Browse files
authored
Mention where LLVM commits should go to in the branches document
1 parent 3f71bb8 commit 8b3cdb4

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

docs/Branches.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,13 @@ You can use any of the branch names as the argument to `--scheme`, such as `mast
5656

5757
- Swift: new commits go to `master`
5858

59-
- LLVM Project: new commits go to `swift/master-next`
59+
- LLVM Project (Non-lldb commits): New commits go to `master` in the upstream [llvm-project](https://github.com/llvm/llvm-project).
60+
61+
... then these commits can be cherry-picked to an appropriate, `swift/master` aligned `apple/stable/*` branch in Apple's fork of [llvm-project](https://github.com/apple/llvm-project). Please see
62+
[Apple's branching scheme](https://github.com/apple/llvm-project/blob/apple/master/apple-docs/AppleBranchingScheme.md)
63+
document to determine which `apple/stable/*` branch you should cherry-pick to.
64+
65+
- LLVM Project (LLDB commits): new commits go to `swift/master-next`
6066

6167
...then cherry-pick to the release branch (`swift/swift-x.y-branch`) if necessary, following the appropriate release process. (Usually this means filling out a standard template, finding someone to review your code if that hasn't already happened, and getting approval from that repo's *release manager.)*
6268

0 commit comments

Comments
 (0)