From fd2cb93cac98b36cd937ac1dbeaeff9dba60a1ff Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 21 Jan 2026 12:05:40 +0000 Subject: [PATCH] fix(cli): skip base files that are branch-specific items When a file (folder.meta.yaml, settings.yaml, etc.) is configured as a branch-specific item, the base file should be skipped and only the branch-specific version (folder.branchName.meta.yaml) should be used. Previously, base files were only skipped if a branch-specific version was already processed, but they should always be skipped for specific items regardless of processing order. Co-Authored-By: Claude Opus 4.5 --- cli/src/commands/sync/sync.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cli/src/commands/sync/sync.ts b/cli/src/commands/sync/sync.ts index 5429d4f8de..530a39831c 100644 --- a/cli/src/commands/sync/sync.ts +++ b/cli/src/commands/sync/sync.ts @@ -1402,11 +1402,15 @@ export async function elementsToMap( continue; } } else if (!isBranchSpecificFile(path)) { - // This is a regular base file, check if we should skip it + // This is a regular base file if (processedBasePaths.has(path)) { // Skip base file, we already processed branch-specific version continue; } + // If this base file is a specific item, skip it - we should only use branch-specific versions + if (isSpecificItem(path, specificItems)) { + continue; + } map[path] = content; } } else {