From c5b207aee8d6d25fb2d9a0a9b81b11a7f26bbf8c Mon Sep 17 00:00:00 2001 From: Defame1297 Date: Sun, 30 Aug 2026 20:50:51 +0000 Subject: [PATCH] fix(git-branches): restore merging.md's provenance back-reference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit references/sources.md credits atlassian-gitflow-tutorial with contributing the `--no-ff` requirement on Gitflow supporting-branch merges to references/merging.md, and merging.md:14 does carry that claim — but the file's own source_keys listed only context7-git-htmldocs, so the chain was one-directional. Surfaced by repairing validate-provenance.sh's Contributing-files parser in the same series; this skill was one of seven whose sources.md the old parser could not read, so checks 4 and 5 had never run against it. Refs #99 --- plugins/git/.apm/skills/git-branches/references/merging.md | 1 + plugins/git/skills/git-branches/references/merging.md | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/git/.apm/skills/git-branches/references/merging.md b/plugins/git/.apm/skills/git-branches/references/merging.md index 0c8f245..d1721e3 100644 --- a/plugins/git/.apm/skills/git-branches/references/merging.md +++ b/plugins/git/.apm/skills/git-branches/references/merging.md @@ -1,6 +1,7 @@ --- source_keys: - context7-git-htmldocs + - atlassian-gitflow-tutorial --- # Merging one branch into another diff --git a/plugins/git/skills/git-branches/references/merging.md b/plugins/git/skills/git-branches/references/merging.md index 0c8f245..d1721e3 100644 --- a/plugins/git/skills/git-branches/references/merging.md +++ b/plugins/git/skills/git-branches/references/merging.md @@ -1,6 +1,7 @@ --- source_keys: - context7-git-htmldocs + - atlassian-gitflow-tutorial --- # Merging one branch into another