Skip to content

chore: script to fetch update from template #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FlandiaYingman merged 4 commits into from
Feb 11, 2026
Merged

chore: script to fetch update from template #62

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4637af3
chore: script to fetch update from template
FlandiaYingman Feb 9, 2026
f4b18e4
chore: update `update-from-template`
FlandiaYingman Feb 9, 2026
439e219
chore(template): simplify `update-from-template` script
polyipseity Feb 11, 2026
b02f0ab
chore(template): make `update-from-template` executable
polyipseity Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions update-from-template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

git fetch https://github.com/USThing/template-api.git main # fetches to `FETCH_HEAD`
git merge FETCH_HEAD -m "chore(template): update from upstream"

echo "Note: Merge conflicts of yarn.lock can be automatically resolved by running \"yarn\" after resolving the conflicts in package.json."