Problem

In the ResetFilesToTargetBranch function in .github/workflows/scripts/inter-branch-merge.ps1, when using the ResetToTargetPaths parameter to reset files to the target branch version, files that exist in the source branch but not in the target branch are still included in the merge PR.

The current implementation only tries to checkout files from the target branch, but if files don't exist there, they remain unchanged in the merge branch.

Additionally, if a pattern matches files where some exist in the target branch and some don't, the ones that don't exist will still be incorrectly included.

Desired Behavior

Scenario	Expected Behavior
File exists in both branches	Reset to target branch version
File exists only in source branch	Delete from merge
File exists only in target branch	No change (will be added by merge)

Solution

Update the logic in the ResetFilesToTargetBranch function to:

1. First, remove all files matching the pattern from the index using git rm
2. Then, checkout files from the target branch (this re-adds only files that exist in target)

This ensures files that only exist in the source branch are removed from the merge, while files that exist in the target branch are reset to their target version.

Code Change

Replace the current pattern processing logic in the foreach ($pattern in $patterns) loop (around lines 139-151) with:

foreach ($pattern in $patterns) {
    $pattern = $pattern.Trim()
    if (-not $pattern) {
        continue
    }

    Write-Host "Processing pattern: $pattern"
    
    # First, remove all files matching the pattern from the merge
    $filesToRemove = & git ls-files $pattern 2>&1
    if ($LASTEXITCODE -eq 0 -and $filesToRemove) {
        Write-Host -f Yellow "Removing files matching '$pattern' from merge"
        & git rm -rf $pattern 2>&1 | Write-Host
        $processedPatterns += $pattern
    }
    
    # Then, checkout any files that exist in target branch (re-adds them)
    & git checkout "origin/$targetBranch" -- $pattern 2>&1 | Write-Host
    if ($LASTEXITCODE -eq 0) {
        Write-Host -f Green "Checked out pattern '$pattern' from $targetBranch"
    }
}

File to modify

.github/workflows/scripts/inter-branch-merge.ps1