Skip to content

Commit eae7236

Browse files
authored
Replace as many references to master with main as currently possible (#561)
1 parent a033686 commit eae7236

File tree

39 files changed

+99
-84
lines changed

39 files changed

+99
-84
lines changed

.changeset/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works with mono-repos or single package repos to help you version and release your code. You can find the full documentation for it [in our repository](https://github.com/changesets/changesets)
44

5-
We have a quick list of common questions to get you started engaging with this project in [our documentation](https://github.com/changesets/changesets/blob/master/docs/common-questions.md)
5+
We have a quick list of common questions to get you started engaging with this project in [our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.circleci/config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ jobs:
1515
name: Install
1616
command: yarn install --pure-lockfile
1717
- run:
18-
name: GitSetup
18+
name: Check Git version
19+
command: git --version
20+
- run:
21+
name: "Git Setup"
1922
command: git config --global user.email "you@example.com" && git config --global user.name "Your Name"
2023
- run:
2124
name: "Jest Tests"

.github/workflows/changeset-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77

88
jobs:
99
release:

docs/adding-a-changeset.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ Changesets are designed to stack, so there's no problem with adding multiple. Yo
6868

6969
## I want to know more about changesets
7070

71-
[here is a more in-depth explanation](https://github.com/Noviny/changesets/blob/master/docs/detailed-explanation.md)
71+
[here is a more in-depth explanation](https://github.com/atlassian/changesets/blob/main/docs/detailed-explanation.md)

docs/automating-changesets.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ In some cases, you may _want_ to merge a change without doing any releases (such
4141
We have a [github action](https://github.com/changesets/action) that
4242

4343
- creates a `version` PR, then keeps it up to date, recreating it when merged. This PR always has an up-to-date run of `changeset version`
44-
- Optionally allows you to do releases when changes are merged to master.
44+
- Optionally allows you to do releases when changes are merged to the base branch.
4545

4646
If you don't want to use this action, the manual workflow we recommend for running the `version` and `publish` commands is:
4747

48-
- A release coordinator (RC) calls to stop any merging to master
49-
- The RC pull down `master`, runs `changeset version`, then make a new PR with the versioning changes
50-
- The versioning changes are merged back into master
51-
- The RC pulls `master` again and runs `changeset publish`
48+
- A release coordinator (RC) calls to stop any merging to the base branch
49+
- The RC pull down the base branch, runs `changeset version`, then make a new PR with the versioning changes
50+
- The versioning changes are merged back into the base branch
51+
- The RC pulls the base branch again and runs `changeset publish`
5252
- The RC runs `git push --follow-tags` to push the release tags back
53-
- The RC unblocks merging to master
53+
- The RC unblocks merging to the base branch
5454

55-
This is a lot of steps, and is quite finnicky (we have to pull from master twice). Feel free to finesse it to your own circumstances.
55+
This is a lot of steps, and is quite finnicky (we have to pull from the base branch twice). Feel free to finesse it to your own circumstances.

docs/command-line-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ changeset version
7373

7474
This is one of two commands responsible for releasing packages. The version command takes changesets that have been made and updates versions and dependencies of packages, as well as writing changelogs. It is responsible for all file changes to versions before publishing to npm occurs.
7575

76-
> We recommend making sure changes made from this commmand are merged back into master before you run publish.
76+
> We recommend making sure changes made from this commmand are merged back into the base branch before you run publish.
7777
7878
Version has two options, `ignore` and `snapshot`:
7979

docs/decisions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ This decision is open for discussion.
5757

5858
## How Changesets interacts with Git
5959

60-
Changesets core flow of adding changesets, versioning packages/writing changelogs and publishing packages should work without Git. Using Git in a way where the user doesn't explicitly ask to do something that involves Git such as showing changed packages in the add command shouldn't show an error if Git fails for any reason. Using Git in a way where the user explicitly chooses to use Git such as using the commit option or `status --since-master`, Changesets should log an error and fail with a non-zero exit code.
60+
Changesets core flow of adding changesets, versioning packages/writing changelogs and publishing packages should work without Git. Using Git in a way where the user doesn't explicitly ask to do something that involves Git such as showing changed packages in the add command shouldn't show an error if Git fails for any reason. Using Git in a way where the user explicitly chooses to use Git such as using the commit option or `status --since main`, Changesets should log an error and fail with a non-zero exit code.

docs/prereleases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ packages/
3434
yarn changeset pre enter next
3535
```
3636

37-
This command changes Changesets into prerelease mode which creates a `pre.json` file in the `.changeset` directory which stores information about the state the prerelease is in. For the specific data stored in the `pre.json` file, see the type definition of `PreState` in [`@changesets/types`](https://github.com/atlassian/changesets/tree/master/packages/types).
37+
This command changes Changesets into prerelease mode which creates a `pre.json` file in the `.changeset` directory which stores information about the state the prerelease is in. For the specific data stored in the `pre.json` file, see the type definition of `PreState` in [`@changesets/types`](https://github.com/atlassian/changesets/tree/main/packages/types).
3838

3939
```
4040
yarn changeset version

packages/apply-release-plan/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204

205205
### Minor Changes
206206

207-
- [`8f0a1ef`](https://github.com/atlassian/changesets/commit/8f0a1ef327563512f471677ef0ca99d30da009c0) [#183](https://github.com/atlassian/changesets/pull/183) Thanks [@mitchellhamilton](https://github.com/mitchellhamilton)! - Add support for prereleases. For more information, see [the docs on prereleases](https://github.com/atlassian/changesets/blob/master/docs/prereleases.md).
207+
- [`8f0a1ef`](https://github.com/atlassian/changesets/commit/8f0a1ef327563512f471677ef0ca99d30da009c0) [#183](https://github.com/atlassian/changesets/pull/183) Thanks [@mitchellhamilton](https://github.com/mitchellhamilton)! - Add support for prereleases. For more information, see [the docs on prereleases](https://github.com/atlassian/changesets/blob/main/docs/prereleases.md).
208208

209209
### Patch Changes
210210

packages/apply-release-plan/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "dist/apply-release-plan.cjs.js",
66
"module": "dist/apply-release-plan.esm.js",
77
"license": "MIT",
8-
"repository": "https://github.com/changesets/changesets/tree/master/packages/apply-release-plan",
8+
"repository": "https://github.com/changesets/changesets/tree/main/packages/apply-release-plan",
99
"dependencies": {
1010
"@babel/runtime": "^7.10.4",
1111
"@changesets/config": "^1.5.0",

0 commit comments

Comments
 (0)