diff --git a/.github/workflows/rebuild.yml b/.github/workflows/rebuild.yml
index 3ce62baefb..9ab1bb4553 100644
--- a/.github/workflows/rebuild.yml
+++ b/.github/workflows/rebuild.yml
@@ -24,6 +24,23 @@ jobs:
gh pr edit --repo github/codeql-action "$PR_NUMBER" \
--remove-label "Rebuild"
+ - name: Merge in changes from base branch
+ env:
+ BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
+ run: |
+ git fetch origin "$BASE_BRANCH"
+
+ # Allow merge conflicts in `lib`, since rebuilding should resolve them.
+ git merge "origin/$BASE_BRANCH" || echo "Merge conflicts detected"
+
+ # Check for merge conflicts outside of `lib`. Disable git diff's trailing whitespace check
+ # since `node_modules/@types/semver/README.md` fails it.
+ if git -c core.whitespace=-trailing-space diff --check | grep --invert-match '^lib/'; then
+ echo "Merge conflicts detected outside of lib/ directory. Please resolve them manually."
+ git -c core.whitespace=-trailing-space diff --check | grep --invert-match '^lib/' || true
+ exit 1
+ fi
+
- name: Compile TypeScript
run: |
npm install
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy