Fix master branch name
This commit is contained in:
@@ -19,12 +19,12 @@ jobs:
|
||||
git remote add upstream https://git.suckless.org/surf || true
|
||||
git fetch upstream
|
||||
|
||||
- name: Merge upstream into master
|
||||
- name: Merge upstream into surf-webkit2
|
||||
run: |
|
||||
git checkout master
|
||||
git merge upstream/master --strategy-option ours --no-edit || true
|
||||
git checkout surf-webkit2
|
||||
git merge upstream/surf-webkit2 --strategy-option ours --no-edit || true
|
||||
|
||||
- name: Push merged branch
|
||||
run: |
|
||||
git push origin master
|
||||
git push origin surf-webkit2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user