upstream merge template repository

[github-actions]

Merge https://github.com/uwhackweek/jupyterbook-template 3bddb53

[scottyhq]

Confused as to why not all changed files were picked up such as book/preliminary/git.md

https://github.com/ICESAT-2HackWeek/IS2-website-2024/actions/runs/9182515238/job/25251582682

checkout branch and pull
  Switched to a new branch 'chore/template_sync_3bddb53'
  ::info::pull changes from source repository
  From https://github.com/uwhackweek/jupyterbook-template
   * branch            HEAD       -> FETCH_HEAD
  CONFLICT (add/add): Merge conflict in conda/environment.yml
  Auto-merging conda/environment.yml
  CONFLICT (add/add): Merge conflict in conda/conda-osx-64.lock.yml
  Auto-merging conda/conda-osx-64.lock.yml
  CONFLICT (add/add): Merge conflict in conda/conda-lock.yml
  Auto-merging conda/conda-lock.yml
  CONFLICT (add/add): Merge conflict in conda/conda-linux-64.lock.yml
  Auto-merging conda/conda-linux-64.lock.yml
  CONFLICT (add/add): Merge conflict in book/preliminary/git.md
  Auto-merging book/preliminary/git.md
  CONFLICT (add/add): Merge conflict in .github/workflows/deploy.yaml
  Auto-merging .github/workflows/deploy.yaml
  CONFLICT (add/add): Merge conflict in .github/workflows/build_website.yaml
  Auto-merging .github/workflows/build_website.yaml
  CONFLICT (add/add): Merge conflict in .github/actions/buildresources/action.yaml
  Auto-merging .github/actions/buildresources/action.yaml
  Automatic merge went well; stopped before committing as requested
  Squash commit -- not updating HEAD
  ::info::restore the ignore file
  ::info::force delete files
  ::warn::force file deletion is enabled. Deleting files which are deleted within the target repository
  ::info::current git hash: a7c4a380bca4ec720c1d62460bcc5950ce5668b0
  ::warn::files to delete: 
::info::commit
commit changes
  ::info::handle .templatesyncignore
  Unstaged changes after reset:
  M	book/preliminary/git.md
  M	conda/conda-linux-64.lock.yml
  M	conda/conda-lock.yml
  M	conda/conda-osx-64.lock.yml
  Removing conda/conda-osx-arm64.lock.yml
  [chore/template_sync_3bddb53 5487349] chore(template): merge template changes :up:
   4 files changed, 2 insertions(+), 3 deletions(-)

[JessicaS11]

Confused as to why not all changed files were picked up such as book/preliminary/git.md

Hmmm... the -X theirs flag should make any conflicted files default to the template version, but it looks like instead none of the conflicted files are being committed (Automatic merge went well; stopped before committing as requested). I can't see where we've "requested" it to stop before committing...

[AndreasAugustin]

Hi,
sorry for jumping in.
The issue is not related to the pull params. It is related to the handling of .templatesyncignore.

conda/*lock changes are not taken because they are excluded within the .templatesyncignore.

book/preliminary/git.md is an issue with the comments within .templatesyncignore. As a temporarly workaround please remove the comments within .templatesyncignore.

More details:
AndreasAugustin/actions-template-sync#282 (comment)

Tracking of the issue:
AndreasAugustin/actions-template-sync#536

[JessicaS11]

@AndreasAugustin Thanks so much for the comment and for all your efforts debugging and addressing the challenges we're running into. We are so excited to be using this action for our resources - it solves a long outstanding issue of updating resources in multiple places!

[JessicaS11]

Many thanks to @AndreasAugustin for the fast fix on this! The action is now picking up these changes (see #3).

cc @scottyhq