@@ -28,9 +28,9 @@ our CLA_. Once that is done, we suggest to continue as follows:
2828
2929- Add an issue on Github and let us know that you're working on something.
3030
31- - Use a feature branch, not master .
31+ - Use a feature branch, not `` main `` .
3232
33- - Rebase your feature branch onto origin/master before raising the PR
33+ - Rebase your feature branch onto origin/main before raising the PR
3434
3535- Be descriptive in your PR and commit messages. What is it for, why is it
3636 needed, etc.
@@ -44,12 +44,12 @@ Rebase
4444------
4545
4646If while you've been working in the feature branch new commits were added to
47- the master branch please don't merge them but use rebase::
47+ the `` main `` branch please don't merge them but use rebase::
4848
4949 git fetch origin
50- git rebase origin/master
50+ git rebase origin/main
5151
52- This will apply all commits on your feature branch on top of the master branch.
52+ This will apply all commits on your feature branch on top of the main branch.
5353Any conflicts can be resolved just the same as if ``git merge `` was used. After
5454the conflict has been resolved use ``git rebase --continue `` to continue the
5555rebase process.
@@ -78,7 +78,7 @@ For example while working on a feature branch you'd use::
7878 git add .
7979 git commit --fixup $(git rev-parse HEAD)
8080
81- git rebase -i origin/master
81+ git rebase -i origin/main
8282
8383``git commit --fixup `` will mark the commit as a fixup relating to the commit
8484HEAD currently points to.
0 commit comments