From 9a03acfcefe6922f14a45d0ce0a4d9699e53d17a Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Mon, 3 Apr 2023 00:11:50 -0400 Subject: [PATCH] dev: update CI to use main as the default branch --- .github/workflows/ci.yml | 2 +- CONTRIBUTING.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc31f5b..e41b5dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: push: branches: - - master + - main - v*.*.x tags: - v*.*.* diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8885691..a5f353e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,8 +20,8 @@ git remote add upstream https://github.com/rails/rails-html-sanitizer.git Make sure your fork is up-to-date and create a topic branch for your feature or bug fix. ``` -git checkout master -git pull upstream master +git checkout main +git pull upstream main git checkout -b my-feature-branch ``` @@ -78,11 +78,11 @@ Go to https://github.com/contributor/rails-html-sanitizer and select your featur #### Rebase -If you've been working on a change for a while, rebase with upstream/master. +If you've been working on a change for a while, rebase with upstream/main. ``` git fetch upstream -git rebase upstream/master +git rebase upstream/main git push origin my-feature-branch -f ```