From 04c1296aed98a10f49ffaf7b3c550c1246b13c8f Mon Sep 17 00:00:00 2001 From: Tom Boucher Date: Thu, 14 May 2026 19:00:41 -0400 Subject: [PATCH] chore: add changeset fragment for #3516 filter fix --- .changeset/serene-pandas-zip.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/serene-pandas-zip.md diff --git a/.changeset/serene-pandas-zip.md b/.changeset/serene-pandas-zip.md new file mode 100644 index 000000000..956bbfbbc --- /dev/null +++ b/.changeset/serene-pandas-zip.md @@ -0,0 +1,5 @@ +--- +type: Fixed +pr: 3516 +--- +**`/gsd-update --reapply` no longer treats installer-authored commits as user customizations** — the git-enhanced two-way merge filter in `get-shit-done/workflows/reapply-patches.md` was missing the `gsd-update` arm after the slash-command rename from `/gsd:update` to `/gsd-update`. Commits created by the current update flow now fall through the filter and are excluded from the diff, preventing spurious merge-conflict prompts. The legacy `gsd:update` arm is preserved for back-compat, and `GSD update` / `gsd-install` exclusions are unchanged. (#3516)