From 7a9592c265a3e53bdff2d0b46a43a90dc4182451 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 17 Jun 2021 14:32:16 +0200 Subject: [PATCH] The default Git branch changed from master to main --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- README.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index bcfae06d3..58ddd89f7 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -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: 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 [Developer's Certificate of Origin](https://github.com/gnss-sdr/gnss-sdr/blob/next/.github/DCO.txt) and [signed your commits](https://gnss-sdr.org/docs/tutorials/using-git/#sign-your-commits) as an indication of fulfillment. 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/). Specifically, you have read [about clang-format](https://gnss-sdr.org/coding-style/#use-tools-for-automated-code-formatting) diff --git a/README.md b/README.md index 96d828f81..b68268d5f 100644 --- a/README.md +++ b/README.md @@ -518,7 +518,7 @@ gnss-sdr with the following structure: |-----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 developments, you can use the 'next' branch by going to the newly created 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: ``` -$ git checkout master # Switch to branch you want to update -$ git pull upstream master # Download the newest code from our repository +$ git checkout main # Switch to branch you want to update +$ git pull upstream main # Download the newest code from our repository ``` or, if you want to test the latest developments: