From b36c1ab6ab10604e0415712530168d1ab52eebdc Mon Sep 17 00:00:00 2001
From: Joseph Macaranas <145489236+jayhawk-commits@users.noreply.github.com>
Date: Tue, 12 Aug 2025 21:38:51 -0400
Subject: [PATCH] [GitHub Actions] Handle subtrees with overlapping names
 (#327)

---
 .github/scripts/pr_merge_sync_patches.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/pr_merge_sync_patches.py b/.github/scripts/pr_merge_sync_patches.py
index 5de8035adb..8ba44cfc13 100644
--- a/.github/scripts/pr_merge_sync_patches.py
+++ b/.github/scripts/pr_merge_sync_patches.py
@@ -208,7 +208,7 @@ def main(argv: Optional[List[str]] = None) -> None:
     merge_sha = client.get_squash_merge_commit(args.repo, args.pr)
     logger.debug(f"Merge commit for PR #{args.pr} in {args.repo}: {merge_sha}")
     for entry in relevant_subtrees:
-        prefix = f"{entry.category}/{entry.name}"
+        prefix = f"{entry.category}/{entry.name}/"
         logger.debug(f"Processing subtree {prefix}")
         with tempfile.TemporaryDirectory() as tmpdir:
             patch_file = Path(tmpdir) / f"{entry.name}.patch"