Skip to content

Commit b24acfb

Browse files
authored
Update publish-to-website.yml
1 parent 3edacb0 commit b24acfb

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

.github/workflows/publish-to-website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
working-directory: innersourcecommons.org
3737
run: |
3838
git checkout --track origin/$BRANCH_NAME || git checkout -b $BRANCH_NAME
39-
git merge -X theirs origin/main --no-edit
39+
git merge -X theirs origin/master --no-edit
4040
- uses: actions/setup-node@v1
4141
with:
4242
node-version: 12

0 commit comments

Comments
 (0)