Skip to content

Commit 378b0a0

Browse files
authored
docs(CONTRIBUTING): update branch name from master to main (#512)
Signed-off-by: Drita-ai <alok.kr300@gmail.com>
1 parent 879841c commit 378b0a0

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

CONTRIBUTING.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ Before you submit your pull request consider the following guidelines:
6464
* Make your changes in a new git branch: techdocs
6565

6666
```text
67-
git checkout -b name/issue-tracker/short-description master
67+
git checkout -b name/issue-tracker/short-description main
6868
```
6969

7070
Name can be initials or GitHub username. An example of this could be:
7171

7272
```text
73-
git checkout -b irmerk/i75/readme-typos master
73+
git checkout -b irmerk/i75/readme-typos main
7474
```
7575

7676
* Create your patch commit, **including appropriate test cases**.
@@ -87,10 +87,10 @@ Before you submit your pull request consider the following guidelines:
8787

8888
Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
8989

90-
* Before creating the Pull Request, ensure your branch sits on top of master (as opposed to branch off a branch). This ensures the reviewer will need only minimal effort to integrate your work by fast-fowarding master:
90+
* Before creating the Pull Request, ensure your branch sits on top of main (as opposed to branch off a branch). This ensures the reviewer will need only minimal effort to integrate your work by fast-fowarding main:
9191

9292
```text
93-
git rebase upstream/master
93+
git rebase upstream/main
9494
```
9595

9696
* Last step before creating the Pull Request, package and run all tests a last time:
@@ -105,7 +105,7 @@ Before you submit your pull request consider the following guidelines:
105105
git push origin name/issue-tracker/short-description
106106
```
107107

108-
* In GitHub, send a pull request to `<REPOSITORY>:master` by following our [pull request conventions][developers.pullrequest]. This will trigger the check of the [Contributor License Agreement][contribute.cla] and the Travis integration.
108+
* In GitHub, send a pull request to `<REPOSITORY>:main` by following our [pull request conventions][developers.pullrequest]. This will trigger the check of the [Contributor License Agreement][contribute.cla] and the Travis integration.
109109
* If you find that the Travis integration has failed, look into the logs on Travis to find out if your changes caused test failures, the commit message was malformed, etc. If you find that the tests failed or times out for unrelated reasons, you can ping a team member so that the build can be restarted.
110110
* If we suggest changes, then:
111111
* Make the required updates.
@@ -116,7 +116,7 @@ Before you submit your pull request consider the following guidelines:
116116
You can also amend the initial commits and force push them to the branch.
117117

118118
```text
119-
git rebase master -i
119+
git rebase main -i
120120
git push origin name/issue-tracker/short-description -f
121121
```
122122
@@ -134,10 +134,10 @@ After your pull request is merged, you can safely delete your branch and pull th
134134
git push origin --delete name/issue-tracker/short-description
135135
```
136136

137-
* Check out the master branch:
137+
* Check out the main branch:
138138

139139
```text
140-
git checkout master -f
140+
git checkout main -f
141141
```
142142

143143
* Delete the local branch:
@@ -146,13 +146,13 @@ After your pull request is merged, you can safely delete your branch and pull th
146146
git branch -D name/issue-tracker/short-description
147147
```
148148

149-
* Update your master with the latest upstream version:
149+
* Update your main with the latest upstream version:
150150

151151
```text
152-
git checkout master
152+
git checkout main
153153
git fetch --all --prune
154-
git rebase upstream/master
155-
git push origin master
154+
git rebase upstream/main
155+
git push origin main
156156
```
157157

158158
## License <a name="license"></a>
@@ -185,5 +185,5 @@ Accord Project documentation files are made available under the [Creative Common
185185

186186
[dcohow]: https://github.com/probot/dco#how-it-works
187187

188-
[apache]: https://github.com/accordproject/techdocs/blob/master/LICENSE
188+
[apache]: https://github.com/accordproject/techdocs/blob/main/LICENSE
189189
[creativecommons]: http://creativecommons.org/licenses/by/4.0/

0 commit comments

Comments
 (0)