Skip to content

fix: Ignore 'git merge' exit code #4

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
langecode merged 2 commits into from
Nov 14, 2025
Merged

fix: Ignore 'git merge' exit code #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ef45c8
fix: Ignore 'git merge' exit code
langecode Nov 14, 2025
15fdb58
chore: Fixin Gemini error
langecode Nov 14, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/sync-upstream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
echo "Latest upstream tag is ${LATEST_TAG}"

# Merge the latest tag, but keep our version of the .github directory
git merge --no-commit upstream ${LATEST_TAG}
git merge --no-commit upstream "${LATEST_TAG}" || true
git reset HEAD .github
rm -rf .github
git checkout HEAD -- .github
Expand Down