diff --git a/.github/workflows/template-sync.yaml b/.github/workflows/template-sync.yaml index 96a424e..cf504a4 100644 --- a/.github/workflows/template-sync.yaml +++ b/.github/workflows/template-sync.yaml @@ -22,7 +22,7 @@ jobs: # comment token (and add .github path to .templatesyncignore) # if you do not want actions and workflows updated with: - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GH_PAT }} - name: actions-template-sync uses: AndreasAugustin/actions-template-sync@v2 @@ -30,4 +30,5 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} source_repo_path: uwhackweek/jupyterbook-template upstream_branch: main # defaults to main - is_force_deletion: True \ No newline at end of file + is_force_deletion: True + git_remote_pull_params: --allow-unrelated-histories --squash --strategy=recursive -X theirs \ No newline at end of file