Skip to content

Fix merge conflict handling in the rebuild workflow #4191

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

Merged
henrymercer merged 2 commits into from
Oct 5, 2026
Merged

Fix merge conflict handling in the rebuild workflow #4191

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27c60c5
Fix detection of merge conflicts outside `lib` in the rebuild workflow
henrymercer Oct 2, 2026
56b0d5f
Fix the rebuild workflow failing when merging the base branch conflicts
henrymercer Oct 2, 2026
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
Next Next commit
Fix detection of merge conflicts outside lib in the rebuild workflow 
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
  • Loading branch information
@henrymercer
henrymercer and Copilot committed Oct 2, 2026
commit 27c60c532d33263f9ac74c05d9e8fff183957676
8 changes: 4 additions & 4 deletions .github/workflows/rebuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ jobs:
if [ "$MERGE_RESULT" -ne 0 ]; then
echo "merge-in-progress=true" >> $GITHUB_OUTPUT

# Check for merge conflicts outside of `lib`. Disable git diff's trailing whitespace check
# since `node_modules/@types/semver/README.md` fails it.
Comment thread
henrymercer marked this conversation as resolved.
if git -c core.whitespace=-trailing-space diff --check | grep --invert-match '^lib/'; then
# Check for merge conflicts outside of `lib`.
CONFLICTS_OUTSIDE_LIB=$(git diff --name-only --diff-filter=U | grep --invert-match '^lib/' || true)
if [ -n "$CONFLICTS_OUTSIDE_LIB" ]; then
echo "Merge conflicts were detected outside of the lib directory. Please resolve them manually."
git -c core.whitespace=-trailing-space diff --check | grep --invert-match '^lib/' || true
echo "$CONFLICTS_OUTSIDE_LIB"
exit 1
fi

Expand Down