The default Git branch changed from master to main

This commit is contained in:
Carles Fernandez 2021-06-17 14:32:16 +02:00
parent ac43615fa1
commit 7a9592c265
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 5 additions and 5 deletions

View File

@ -30,14 +30,14 @@ stakeholders, make sure that all are listed, each with a separate
Before submitting your pull request, please make sure the following is done: Before submitting your pull request, please make sure the following is done:
1. You undertake the 1. You undertake the
[Contributor Covenant Code of Conduct](https://github.com/gnss-sdr/gnss-sdr/blob/master/CODE_OF_CONDUCT.md). [Contributor Covenant Code of Conduct](https://github.com/gnss-sdr/gnss-sdr/blob/main/CODE_OF_CONDUCT.md).
2. You have read the 2. You have read the
[Developer's Certificate of Origin](https://github.com/gnss-sdr/gnss-sdr/blob/next/.github/DCO.txt) [Developer's Certificate of Origin](https://github.com/gnss-sdr/gnss-sdr/blob/next/.github/DCO.txt)
and and
[signed your commits](https://gnss-sdr.org/docs/tutorials/using-git/#sign-your-commits) [signed your commits](https://gnss-sdr.org/docs/tutorials/using-git/#sign-your-commits)
as an indication of fulfillment. as an indication of fulfillment.
3. You have read the 3. You have read the
[Contributing Guidelines](https://github.com/gnss-sdr/gnss-sdr/blob/master/CONTRIBUTING.md). [Contributing Guidelines](https://github.com/gnss-sdr/gnss-sdr/blob/main/CONTRIBUTING.md).
4. You have read the [coding style guide](https://gnss-sdr.org/coding-style/). 4. You have read the [coding style guide](https://gnss-sdr.org/coding-style/).
Specifically, you have read Specifically, you have read
[about clang-format](https://gnss-sdr.org/coding-style/#use-tools-for-automated-code-formatting) [about clang-format](https://gnss-sdr.org/coding-style/#use-tools-for-automated-code-formatting)

View File

@ -518,7 +518,7 @@ gnss-sdr with the following structure:
|-----utils <- some utilities (e.g. Matlab scripts). |-----utils <- some utilities (e.g. Matlab scripts).
``` ```
By default, you will be in the 'master' branch of the Git repository, which By default, you will be in the 'main' branch of the Git repository, which
corresponds to the latest stable release. If you want to try the latest corresponds to the latest stable release. If you want to try the latest
developments, you can use the 'next' branch by going to the newly created developments, you can use the 'next' branch by going to the newly created
gnss-sdr folder doing: gnss-sdr folder doing:
@ -968,8 +968,8 @@ $ git remote add upstream https://github.com/gnss-sdr/gnss-sdr.git
and then you can update your working copy by doing: and then you can update your working copy by doing:
``` ```
$ git checkout master # Switch to branch you want to update $ git checkout main # Switch to branch you want to update
$ git pull upstream master # Download the newest code from our repository $ git pull upstream main # Download the newest code from our repository
``` ```
or, if you want to test the latest developments: or, if you want to test the latest developments: