Skip to content

Commit 1483811

Browse files
authored
Update sync-branches.yml
1 parent 5ec2a3d commit 1483811

1 file changed

Lines changed: 1 addition & 12 deletions

File tree

.github/workflows/sync-branches.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,4 @@ jobs:
3636
git push origin $TARGET_BRANCH || echo "Failed to push $TARGET_BRANCH"
3737
fi
3838
git reset --hard main
39-
git push origin $TARGET_BRANCH --force || echo "Failed to force push $TARGET_BRANCH" - name: Sync with Content Branch
40-
run: |
41-
git checkout content
42-
git pull origin content || echo "No changes to pull for content"
43-
git reset --hard origin/main
44-
git merge --squash origin/main || echo "No changes to merge for content"
45-
if [ -n "$(git status --porcelain)" ]; then
46-
git commit -m "Squash merge changes from main into content"
47-
git push origin content || echo "Failed to push content branch"
48-
fi
49-
git reset --hard main
50-
git push origin content --force || echo "Failed to force push content branch"
39+
git push origin $TARGET_BRANCH --force || echo "Failed to force push $TARGET_BRANCH"

0 commit comments

Comments
 (0)