Skip to content

Commit 9c9528a

Browse files
authored
Mention specifically the Swift/vs non Swift llvm-project changes
1 parent 8b3cdb4 commit 9c9528a

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

docs/Branches.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,17 @@ 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 (Non-lldb commits): New commits go to `master` in the upstream [llvm-project](https://github.com/llvm/llvm-project).
59+
- LLVM Project: the destination branch depends on the kind of change that must be made:
60+
61+
1) LLVM Project changes that don't depend on Swift: New commits go to `master` in the upstream [llvm-project](https://github.com/llvm/llvm-project).
6062

6163
... 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
6264
[Apple's branching scheme](https://github.com/apple/llvm-project/blob/apple/master/apple-docs/AppleBranchingScheme.md)
6365
document to determine which `apple/stable/*` branch you should cherry-pick to.
6466

65-
- LLVM Project (LLDB commits): new commits go to `swift/master-next`
67+
2) Changes that depend on Swift (this only applies to LLDB): new commits go to `swift/master-next`
6668

67-
...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.)*
69+
...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.)*
6870

6971
## Automerging
7072

0 commit comments

Comments
 (0)