Skip to content

fix: disambiguate sync-from-public branch checkout #1235

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
notgitika merged 1 commit into from
May 13, 2026
+2 −4
Merged

fix: disambiguate sync-from-public branch checkout #1235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions .github/workflows/sync-from-public.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ jobs:

- name: Sync main with public/main
run: |
git checkout main
git reset --hard origin/main
git checkout -B main origin/main

# Check if public/main is already merged
if git merge-base --is-ancestor public/main HEAD; then
Expand Down Expand Up @@ -137,8 +136,7 @@ jobs:

- name: Sync preview with public/preview
run: |
git checkout preview
git reset --hard origin/preview
git checkout -B preview origin/preview

# Check if public/preview is already merged
if git merge-base --is-ancestor public/preview HEAD; then
Expand Down
Loading