From 0e303384d818df69d635983fbf38bec4e0185813 Mon Sep 17 00:00:00 2001 From: Axel Seemann Date: Wed, 26 Aug 2026 09:36:55 +0200 Subject: [PATCH] feat(triggers): add silent-merge and branch-sync trigger words A /retro session on 2026-08-26 found the assistant never invoked this skill while merging a 90-commit-diverged master into an integration branch, despite the skill already documenting the exact failure mode it hit ("A merge resolved in favour of the branch silently reverts upstream work") and shipping two evals for it (detect_upstream_work_dropped_by_merge, clean_merge_can_drop_entries). The description read as PR-centric ("merging PRs", "handling merge conflicts") and did not surface for a raw branch-to-branch sync done outside a PR flow. Learning-Id: retro-20260826-git-workflow-merge-trigger Signed-off-by: Axel Seemann --- skills/git-workflow/SKILL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skills/git-workflow/SKILL.md b/skills/git-workflow/SKILL.md index 80bcfed..5ed931e 100644 --- a/skills/git-workflow/SKILL.md +++ b/skills/git-workflow/SKILL.md @@ -1,6 +1,6 @@ --- name: git-workflow -description: "Use when establishing branching strategies, implementing Conventional Commits, creating or reviewing PRs, resolving PR review comments, merging PRs (including CI verification, auto-merge queues, and post-merge cleanup), managing PR review threads, merging PRs with signed commits, handling merge conflicts, rebasing a long-lived branch onto a moved base or splitting one into several PRs, integrating Git with CI/CD, setting up git hooks (lefthook, captainhook, husky, pre-commit), or debugging hook-install failures in git worktrees. Not for creating releases (use github-release) or diagnosing BLOCKED/won't-merge PRs (use github-project)." +description: "Use when establishing branching strategies, implementing Conventional Commits, creating or reviewing PRs, resolving PR review comments, merging PRs (including CI verification, auto-merge queues, and post-merge cleanup), managing PR review threads, merging PRs with signed commits, handling merge conflicts, verifying a merge didn't silently drop changes, syncing a long-diverged branch (e.g. master into integration), rebasing a long-lived branch onto a moved base or splitting one into several PRs, integrating Git with CI/CD, setting up git hooks (lefthook, captainhook, husky, pre-commit), or debugging hook-install failures in git worktrees. Not for creating releases (use github-release) or diagnosing BLOCKED/won't-merge PRs (use github-project)." license: "(MIT AND CC-BY-SA-4.0). See LICENSE-MIT and LICENSE-CC-BY-SA-4.0" compatibility: "Requires git, gh CLI; yq for .spec-cleanup.yml." metadata: