From 55971c992ac511b140d0c01dbffd862657644a63 Mon Sep 17 00:00:00 2001 From: Jason Axelson Date: Sun, 24 Sep 2023 21:02:12 -1000 Subject: [PATCH] Remove references to old master branch (#334) --- .github/CONTRIBUTING.md | 26 +++++++++++++------------- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 94f52f39..7a0a52e6 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -52,7 +52,7 @@ Guidelines for bug reports: reported. 2. **Check if the issue has been fixed** — try to reproduce it using the - `master` branch in the repository. + `main` branch in the repository. 3. **Isolate and report the problem** — ideally, create a reduced test case. @@ -165,16 +165,16 @@ excellent pull request: your fork: ```bash - git checkout master - git pull upstream master + git checkout main + git pull upstream main git push ``` -3. Create a new topic branch (off of `master`) to contain your feature, change, +3. Create a new topic branch (off of `main`) to contain your feature, change, or fix. - **IMPORTANT**: Making changes in `master` is discouraged. You should always - keep your local `master` in sync with upstream `master` and make your + **IMPORTANT**: Making changes in `main` is discouraged. You should always + keep your local `main` in sync with upstream `main` and make your changes in topic branches. ```bash @@ -203,17 +203,17 @@ excellent pull request: with a clear title and description. 8. If you haven't updated your pull request for a while, you should consider - rebasing on master and resolving any conflicts. + rebasing on main and resolving any conflicts. - **IMPORTANT**: _Never ever_ merge upstream `master` into your branches. You - should always `git rebase` on `master` to bring your changes up to date when + **IMPORTANT**: _Never ever_ merge upstream `main` into your branches. You + should always `git rebase` on `main` to bring your changes up to date when necessary. ```bash - git checkout master - git pull upstream master + git checkout main + git pull upstream main git checkout - git rebase master + git rebase main ``` Thank you for your contributions! @@ -244,4 +244,4 @@ For formatting the guides: * We use backticks for module names, function names, and variable names. This contribution guide is adapted from the [Phoenix contribution -guide](https://github.com/phoenixframework/phoenix/blob/master/CONTRIBUTING.md). +guide](https://github.com/phoenixframework/phoenix/blob/main/CONTRIBUTING.md). diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 50ab394c..6fe238b9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@