Skip to content

Commit

Permalink
dev: update CI to use main as the default branch
Browse files Browse the repository at this point in the history
  • Loading branch information
flavorjones committed Apr 3, 2023
1 parent 18b2953 commit 9a03acf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
workflow_dispatch:
push:
branches:
- master
- main
- v*.*.x
tags:
- v*.*.*
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down Expand Up @@ -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
```

Expand Down

0 comments on commit 9a03acf

Please sign in to comment.