Skip to content

fix: sync-upstream fetches upstream/master not upstream/main #14

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
stubbi merged 1 commit into from
Mar 22, 2026
Merged

fix: sync-upstream fetches upstream/master not upstream/main #14

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
8 changes: 4 additions & 4 deletions .github/workflows/sync-upstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ jobs:
run: git remote add upstream https://github.com/paperclipai/paperclip.git

- name: Fetch upstream
run: git fetch upstream main
run: git fetch upstream master

- name: Check for new commits
id: check
run: |
behind=$(git rev-list --count HEAD..upstream/main)
behind=$(git rev-list --count HEAD..upstream/master)
echo "behind=$behind" >> "$GITHUB_OUTPUT"
if [ "$behind" -eq 0 ]; then
echo "Already up to date with upstream."
Expand All @@ -50,7 +50,7 @@ jobs:

git checkout -B "$BRANCH"

if git rebase upstream/main; then
if git rebase upstream/master; then
echo "conflict=false" >> "$GITHUB_OUTPUT"
else
git rebase --abort
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
```bash
git fetch origin sync/upstream
git checkout sync/upstream
git rebase upstream/main
git rebase upstream/master
# resolve conflicts
git push --force origin sync/upstream
```
Expand Down
Loading