Skip to content

Fix inter-branch-merge to create proper merge commit when using ResetToTargetPaths #16673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PureWeen wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −2
Open

Fix inter-branch-merge to create proper merge commit when using ResetToTargetPaths #16673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions .github/workflows/scripts/inter-branch-merge.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,32 @@ try {
Write-Host $committersList

$mergeBranchName = "merge/$MergeFromBranch-to-$MergeToBranch"
Invoke-Block { & git checkout -B $mergeBranchName }

# Reset specified files to target branch if ResetToTargetPaths is configured
# When ResetToTargetPaths is configured, we need to create a proper merge commit
# so that the target branch content is included. Without this, the merge branch
# would just be the source branch with some files overwritten, missing all
# target-only changes (APIs, fixes, platform versions, etc.).
if ($ResetToTargetPaths) {
# Configure git user for the merge commit
Invoke-Block { & git config user.name "github-actions[bot]" }
Invoke-Block { & git config user.email "41898282+github-actions[bot]@users.noreply.github.com" }

# Start from the target branch and merge source into it
Invoke-Block { & git checkout -B $mergeBranchName "origin/$MergeToBranch" }

# Merge source branch. Use -X theirs to auto-resolve conflicts in favor of
# the source branch, since ResetToTargetPaths will overwrite target-wins files
# in the next step anyway.
Invoke-Block { & git merge --no-ff "origin/$MergeFromBranch" -X theirs -m "Merge branch '$MergeFromBranch' into $MergeToBranch" }

$patterns = $ResetToTargetPaths -split ";"
ResetFilesToTargetBranch $patterns $MergeToBranch
}
else {
# Without ResetToTargetPaths, the original behavior is fine: create a branch
# from the source and let GitHub's merge button do the actual merge.
Invoke-Block { & git checkout -B $mergeBranchName }
}

$remoteName = 'origin'
$prOwnerName = $RepoOwner
Expand Down