Skip to content

Commit

Permalink
Update links to support main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
pixyzehn committed Nov 7, 2020
1 parent 0b122bd commit af6a43f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ license](https://swift.org/LICENSE.txt).
---

Before submitting the pull request, please make sure you have [tested your
changes](https://github.com/apple/swift/blob/master/docs/ContinuousIntegration.md)
changes](https://github.com/apple/swift/blob/main/docs/ContinuousIntegration.md)
and that they follow the Swift project [guidelines for contributing
code](https://swift.org/contributing/#contributing-code).
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ is also expressed in the `SwiftSyntax` dependency in

| Xcode Release | Swift Version | `swift-format` Branch |
|:-------------:|:---------------------------------------:|:----------------------|
|| Swift at `master` | `master` |
|| Swift at `main` | `main` |
| Xcode 12.0 | Swift 5.3 | `swift-5.3-branch` |
| Xcode 11.4 | Swift 5.2 | `swift-5.2-branch` |
| Xcode 11.0 | Swift 5.1 | `swift-5.1-branch` |
Expand All @@ -42,8 +42,8 @@ swift build
You can also add the `--single-branch` option if you only want to clone that
specific branch.

The `master` branch is used for development and may depend on either a release
version of Swift or on a developer snapshot. Changes committed to `master`
The `main` branch is used for development and may depend on either a release
version of Swift or on a developer snapshot. Changes committed to `main`
that are compatible with the latest release branch will be cherry-picked into
that branch.

Expand Down

0 comments on commit af6a43f

Please sign in to comment.