Fix merge conflict handling in the rebuild workflow - #4191

Open

henrymercer wants to merge 2 commits into

mainfrom

henrymercer/ci-job-failure-investigation

Commits on Oct 2, 2026

Fix detection of merge conflicts outside `lib` in the rebuild workflow

henrymercer
and
Copilot
committed
27c60c5
Fix the rebuild workflow failing when merging the base branch conflicts

henrymercer
and
Copilot
committed
56b0d5f