File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 6
6
workflow_dispatch :
7
7
push :
8
8
branches :
9
- - master
9
+ - main
10
10
- v*.*.x
11
11
tags :
12
12
- v*.*.*
Original file line number Diff line number Diff line change @@ -20,8 +20,8 @@ git remote add upstream https://github.com/rails/rails-html-sanitizer.git
20
20
Make sure your fork is up-to-date and create a topic branch for your feature or bug fix.
21
21
22
22
```
23
- git checkout master
24
- git pull upstream master
23
+ git checkout main
24
+ git pull upstream main
25
25
git checkout -b my-feature-branch
26
26
```
27
27
@@ -78,11 +78,11 @@ Go to https://github.com/contributor/rails-html-sanitizer and select your featur
78
78
79
79
#### Rebase
80
80
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 .
82
82
83
83
```
84
84
git fetch upstream
85
- git rebase upstream/master
85
+ git rebase upstream/main
86
86
git push origin my-feature-branch -f
87
87
```
88
88
You can’t perform that action at this time.
0 commit comments