tiennm99/awesome-coding-agents
1
0
Fork 0
mirror of https://github.com/tiennm99/awesome-coding-agents.git synced 2026-05-13 21:52:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(workflow): use -X theirs to resolve history.jsonl rebase conflicts

Browse Source
This commit is contained in:
tiennm99
2026-05-13 14:47:39 +07:00
committed by tiennm99
parent 6e05f33050
commit fedb806fc8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/update.yml
+3 -2
View File
@@ -46,10 +46,11 @@ jobs:
exit 0
fi
git commit -m "chore: daily ranking refresh"
# rebase + retry guards against the race where two runs commit near-simultaneously
# rebase + retry guards against the race where two runs commit near-simultaneously.
# -X theirs makes our run's data/history.jsonl line win conflicts (our snapshot is the freshest).
for attempt in 1 2 3; do
if git push; then exit 0; fi
echo "push attempt $attempt rejected, rebasing on origin/main"
git pull --rebase origin main
git pull --rebase -X theirs origin main
done
exit 1