From 3c5072b3f86ca2604421385b25bdd79c39eb7d3c Mon Sep 17 00:00:00 2001 From: Jon Uhlmann Date: Fri, 1 Jan 2021 20:34:06 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9D=20Change=20default=20branch=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 38f9236..a31d6db 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -20,11 +20,11 @@ chance of keeping on top of things. ## Making Changes - Create a topic branch from where you want to base your work. - - This is usually the master branch. + - This is usually the main branch. - Only target release branches if you are certain your fix must be on that branch. - - To quickly create a topic branch based on master; `git branch master/my_contribution master` then checkout the new branch with `git checkout master/my_contribution`. Better avoid working directly on the - `master` branch, to avoid conflicts if you pull in updates from origin. + - To quickly create a topic branch based on main; `git branch main/my_contribution main` then checkout the new branch with `git checkout main/my_contribution`. Better avoid working directly on the + `main` branch, to avoid conflicts if you pull in updates from origin. - Make commits of logical units. - Check for unnecessary whitespace with `git diff --check` before committing. - Use descriptive commit messages and reference the #issue number.