You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: docs/Branches.md
+7-7Lines changed: 7 additions & 7 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -2,9 +2,9 @@
2
2
3
3
## The Development Branches
4
4
5
-
| Swift | LLVM Project|
6
-
| ------ | ------|
7
-
| master | swift/master|
5
+
| Swift | LLVM Project
6
+
| ------ | ------------
7
+
| master | swift/master
8
8
9
9
`master` is the place for active development on Swift. If you're just working on Swift, that's where you'll spend most of your time.
10
10
@@ -19,7 +19,7 @@ To switch from one set of branches to another, you can use `utils/update-checkou
19
19
## The Release Branches
20
20
21
21
| Swift | LLVM Project
22
-
| ---------------- | ----------------
22
+
| ---------------- | ----------------------
23
23
| swift-x.y-branch | swift/swift-x.y-branch
24
24
25
25
At some point before a release, a *release branch* will be created in every repository with a name like `swift-4.0-branch`. (The actual number is chosen by Apple.) After the branch has been created, commits must make it to this branch to make it into the release. In some cases, the [release manager][] for the branch will decide to merge in all additional changes from `master`; otherwise, cherry-picking changes and making a new pull request is the way to go. If there are any "patch" releases (e.g. Swift 4.0.1), they will also come from this branch.
@@ -30,7 +30,7 @@ Note that these branches come not from the "development" branches (above), but t
30
30
## The Upstream Branches
31
31
32
32
| Swift | LLVM Project
33
-
| ----------- | -------------------
33
+
| ----------- | -----------------
34
34
| master-next | swift/master-next
35
35
36
36
`swift/master-next` is a branch for LLVM that includes all changes necessary to support Swift. Changes from llvm.org's master branch are automatically merged in. Why isn't this just `swift/master`? Well, because LLVM changes *very* rapidly, and that wouldn't be very stable. However, we do want to make sure the Swift stuff keeps working.
@@ -58,7 +58,7 @@ You can use any of the branch names as the argument to `--scheme`, such as `mast
58
58
59
59
- LLVM Project: new commits go to `swift/master-next`
60
60
61
-
...then cherry-pick to the release branch (`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.)*
61
+
...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.)*
62
62
63
63
## Automerging
64
64
@@ -68,6 +68,6 @@ Some branches are *automerged* into other branches, to keep them in sync. This i
68
68
-`master` is automerged into `master-next`
69
69
70
70
### LLVM Project
71
-
-`swift-x.y-branch` (the *latest* release branch) is automerged into `swift/master`
71
+
-`swift/swift-x.y-branch` (the *latest* release branch) is automerged into `swift/master`
72
72
- llvm.org's `master` is automerged into `swift/master-next`
73
73
- llvm.org's release branch *may* be automerged into `swift-x.y-branch`, if they are in sync
0 commit comments