safe-outputs: make create-pull-request bundling resilient to diverged-history replay conflicts#40720

Merged

pelikhan merged 8 commits into

mainfrom

copilot/chaosreconcile-spark-diverged-history-reconciliati

Jun 22, 2026

Commits on Jun 22, 2026

Initial plan
Copilot
authored
Include push error details in create_pr fallback issues

Copilot
and
pelikhan
authored
Apply remaining changes

Copilot
and
pelikhan
authored
Address review feedback: sanitize push error, fix trailing whitespace, add patch fallback test

Copilot
and
pelikhan
authored
Merge branch 'main' into copilot/chaosreconcile-spark-diverged-history-reconciliati
github-actions[bot]
authored
Plan: add reconcile-spark push-failure git integration test

Copilot
and
pelikhan
authored
Add reconcile-spark push-failure git integration test with detailed comments

Copilot
and
pelikhan
authored
Fix American English spelling in reconcile-spark integration test comments

Copilot
and
pelikhan
authored