-
Notifications
You must be signed in to change notification settings - Fork 14
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
Showing
1 changed file
with
4 additions
and
4 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 |
---|---|---|
|
@@ -16,7 +16,7 @@ jobs: | |
uses: actions/checkout@v2 | ||
with: | ||
fetch-depth: 0 | ||
|
||
# Use the yaml-env-action action. | ||
- name: Load environment from YAML | ||
uses: doughepi/[email protected] | ||
|
@@ -326,9 +326,9 @@ jobs: | |
git checkout $branch_name | ||
# Start fresh and delete these files | ||
rm -rf docs/* *.rds | ||
git rm docs/* | ||
git rm *.rds | ||
rm -rf docs/* || echo "no docs/ folder to delete" | ||
rm -rf *.rds || echo "no RDS file to delete" | ||
git add . | ||
git commit -m "delete docs" | ||
git merge -s recursive --strategy-option=theirs origin/${{ github.head_ref }} | ||
|