Skip to content

Commit fa6ffee

Browse files
authored
Direct users to create branches off of main (#101)
Update user docs to have contributions be branched off of main.
1 parent e69f8ef commit fa6ffee

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

CONTRIBUTING.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Before you submit your pull request consider the following guidelines:
109109
* Make your changes in a new git branch:
110110

111111
```shell
112-
git checkout -b my-fix-branch master
112+
git checkout -b my-fix-branch main
113113
```
114114

115115
* Create your patch, **including appropriate test cases**.
@@ -133,14 +133,14 @@ Before you submit your pull request consider the following guidelines:
133133
git push origin my-fix-branch
134134
```
135135

136-
* In GitHub, send a pull request to `firebase/quickstart-cpp:master`.
136+
* In GitHub, send a pull request to `firebase/quickstart-cpp:main`.
137137
* If we suggest changes then:
138138
* Make the required updates.
139139
* Rebase your branch and force push to your GitHub repository (this will
140140
update your Pull Request):
141141

142142
```shell
143-
git rebase master -i
143+
git rebase main -i
144144
git push origin my-fix-branch -f
145145
```
146146

@@ -158,10 +158,10 @@ the changes from the main (upstream) repository:
158158
git push origin --delete my-fix-branch
159159
```
160160
161-
* Check out the master branch:
161+
* Check out the main branch:
162162
163163
```shell
164-
git checkout master -f
164+
git checkout main -f
165165
```
166166
167167
* Delete the local branch:
@@ -170,10 +170,10 @@ the changes from the main (upstream) repository:
170170
git branch -D my-fix-branch
171171
```
172172
173-
* Update your master with the latest upstream version:
173+
* Update your main with the latest upstream version:
174174
175175
```shell
176-
git pull --ff upstream master
176+
git pull --ff upstream main
177177
```
178178
179179
## <a name="rules"></a> Coding Rules
@@ -186,7 +186,7 @@ Please sign our [Contributor License Agreement][google-cla] (CLA) before sending
186186
pull requests. For any code changes to be accepted, the CLA must be signed.
187187
It's a quick process, we promise!
188188

189-
*This guide was inspired by the [AngularJS contribution guidelines](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md).*
189+
*This guide was inspired by the [AngularJS contribution guidelines](https://github.com/angular/angular.js/blob/main/CONTRIBUTING.md).*
190190

191191
[github]: https://github.com/firebase/quickstart-cpp
192192
[google-cla]: https://cla.developers.google.com

0 commit comments

Comments
 (0)