Skip to content

Commit 58479bd

Browse files
committed
[Doc] Update the release branch and format for the table
1 parent 982afa0 commit 58479bd

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

docs/Branches.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
## The Development Branches
44

5-
| Swift | LLVM Project |
6-
| ------ | ------ |
7-
| master | swift/master |
5+
| Swift | LLVM Project
6+
| ------ | ------------
7+
| master | swift/master
88

99
`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.
1010

@@ -19,7 +19,7 @@ To switch from one set of branches to another, you can use `utils/update-checkou
1919
## The Release Branches
2020

2121
| Swift | LLVM Project
22-
| ---------------- | ----------------
22+
| ---------------- | ----------------------
2323
| swift-x.y-branch | swift/swift-x.y-branch
2424

2525
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
3030
## The Upstream Branches
3131

3232
| Swift | LLVM Project
33-
| ----------- | -------------------
33+
| ----------- | -----------------
3434
| master-next | swift/master-next
3535

3636
`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
5858

5959
- LLVM Project: new commits go to `swift/master-next`
6060

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.)*
6262

6363
## Automerging
6464

@@ -68,6 +68,6 @@ Some branches are *automerged* into other branches, to keep them in sync. This i
6868
- `master` is automerged into `master-next`
6969

7070
### 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`
7272
- llvm.org's `master` is automerged into `swift/master-next`
7373
- llvm.org's release branch *may* be automerged into `swift-x.y-branch`, if they are in sync

0 commit comments

Comments
 (0)