From 4637af348a5fc107e457755d2ce1d9f34557496d Mon Sep 17 00:00:00 2001 From: Flandia Yingman Date: Mon, 9 Feb 2026 03:01:37 -0500 Subject: [PATCH 1/4] chore: script to fetch update from template --- update-from-template | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 update-from-template diff --git a/update-from-template b/update-from-template new file mode 100644 index 0000000..c14d9a6 --- /dev/null +++ b/update-from-template @@ -0,0 +1,7 @@ +#!/bin/bash + +git remote add upstream https://github.com/USThing/template-api.git +git fetch upstream main +git merge upstream/main -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. From f4b18e449e595eba4034cb11aac316808839dfa4 Mon Sep 17 00:00:00 2001 From: Flandia Date: Mon, 9 Feb 2026 03:07:00 -0500 Subject: [PATCH 2/4] chore: update `update-from-template` Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- update-from-template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-from-template b/update-from-template index c14d9a6..ec5de26 100644 --- a/update-from-template +++ b/update-from-template @@ -4,4 +4,4 @@ git remote add upstream https://github.com/USThing/template-api.git git fetch upstream main git merge upstream/main -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. +echo "Note: Merge conflicts of yarn.lock can be automatically resolved by running \"yarn\" after resolving the conflicts in package.json." From 439e219114d1ca324dbcfa05c45ab6a0970ea947 Mon Sep 17 00:00:00 2001 From: William So Date: Wed, 11 Feb 2026 14:23:38 +0800 Subject: [PATCH 3/4] chore(template): simplify `update-from-template` script --- update-from-template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/update-from-template b/update-from-template index ec5de26..2b3a235 100644 --- a/update-from-template +++ b/update-from-template @@ -1,7 +1,6 @@ #!/bin/bash -git remote add upstream https://github.com/USThing/template-api.git -git fetch upstream main -git merge upstream/main -m "chore(template): update from upstream" +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." From b02f0abe2624d16bb75cc17408802066d24745fa Mon Sep 17 00:00:00 2001 From: William So Date: Wed, 11 Feb 2026 14:24:18 +0800 Subject: [PATCH 4/4] chore(template): make `update-from-template` executable --- update-from-template | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 update-from-template diff --git a/update-from-template b/update-from-template old mode 100644 new mode 100755