File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed
src/content-pipelines/state Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -71,12 +71,12 @@ jobs:
7171 git config user.email "github-actions[bot]@users.noreply.github.com"
7272
7373 if git ls-remote --exit-code --heads origin "$UPDATE_BRANCH" > /dev/null 2>&1; then
74- git fetch origin "$UPDATE_BRANCH" main
74+ git fetch --unshallow origin "$UPDATE_BRANCH" main 2>/dev/null || git fetch origin "$UPDATE_BRANCH" main
7575 git checkout "$UPDATE_BRANCH"
7676 git merge origin/main --no-edit || {
7777 echo "Merge conflict with main — resetting branch to main"
7878 git merge --abort 2>/dev/null || true
79- git checkout main
79+ git checkout -f main
8080 git branch -D "$UPDATE_BRANCH"
8181 if [ -z "$PR_NUMBER" ]; then
8282 git push origin --delete "$UPDATE_BRANCH" || true
Original file line number Diff line number Diff line change 1- 4444e426d03e2d5f533c3ded10ad29c798fadb08
1+ 990f654fe346f8ee9e49f3aea699a71c01a7814c
You can’t perform that action at this time.
0 commit comments