Skip to content

Fall back to original base commit when git am --3way fails due to merge conflicts#23132

Merged
dsyme merged 7 commits into
mainfrom
copilot/fix-pr-creation-merge-conflicts
Mar 26, 2026
Merged

Fall back to original base commit when git am --3way fails due to merge conflicts#23132
dsyme merged 7 commits into
mainfrom
copilot/fix-pr-creation-merge-conflicts

fix: record base commit at patch generation time for fallback

250fc74
Select commit
Loading
Failed to load commit list.