-
-
Notifications
You must be signed in to change notification settings - Fork 83
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b1757b6
commit 197bb49
Showing
1 changed file
with
2 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,13 +19,13 @@ jobs: | |
# Steps represent a sequence of tasks that will be executed as part of the job | ||
steps: | ||
# Checkout the branch fix/dependencies with the PAT | ||
- uses: actions/checkout@v2 | ||
- uses: actions/checkout@v2 | ||
with: | ||
ref: fix/dependencies | ||
token: ${{ secrets.PAT }} | ||
fetch-depth: 0 | ||
- name: Merge master | ||
run: | | ||
git fetch | ||
git config user.name github-actions | ||
git config user.email [email protected] | ||
git merge origin/master --allow-unrelated-histories | ||
|