Skip to content

Commit

Permalink
Merge pull request #48 from nfa-vfxim/bo
Browse files Browse the repository at this point in the history
Updated actions
  • Loading branch information
bkamphues authored Apr 9, 2021
2 parents cf5468e + 2fcf1c9 commit 5058b27
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/github-actions-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
- run: git fetch origin master
- run: git merge -s recursive -X theirs origin/master --allow-unrelated-histories
- run: git add .
- run: git status
- run: git commit -m "Github Actions"
- run: git push
update-3ejaars_source-branch:
Expand All @@ -35,5 +36,6 @@ jobs:
- run: git fetch origin master
- run: git merge -s recursive -X theirs origin/master --allow-unrelated-histories
- run: git add .
- run: git status
- run: git commit -m "Github Actions"
- run: git push

0 comments on commit 5058b27

Please sign in to comment.