Skip to content

Commit 9a03acf

Browse files
committed
dev: update CI to use main as the default branch
1 parent 18b2953 commit 9a03acf

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
workflow_dispatch:
77
push:
88
branches:
9-
- master
9+
- main
1010
- v*.*.x
1111
tags:
1212
- v*.*.*

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ git remote add upstream https://github.com/rails/rails-html-sanitizer.git
2020
Make sure your fork is up-to-date and create a topic branch for your feature or bug fix.
2121

2222
```
23-
git checkout master
24-
git pull upstream master
23+
git checkout main
24+
git pull upstream main
2525
git checkout -b my-feature-branch
2626
```
2727

@@ -78,11 +78,11 @@ Go to https://github.com/contributor/rails-html-sanitizer and select your featur
7878

7979
#### Rebase
8080

81-
If you've been working on a change for a while, rebase with upstream/master.
81+
If you've been working on a change for a while, rebase with upstream/main.
8282

8383
```
8484
git fetch upstream
85-
git rebase upstream/master
85+
git rebase upstream/main
8686
git push origin my-feature-branch -f
8787
```
8888

0 commit comments

Comments
 (0)