Skip to content

Commit 25630d1

Browse files
committed
fix: pull before push in evolve.sh to avoid rejected pushes
1 parent fdd6967 commit 25630d1

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

scripts/evolution/evolve.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ if [[ -n $(git status -s) ]]; then
167167
git add -A
168168
git commit -m "iterate: Day $DAY evolution session" 2>/dev/null || true
169169
fi
170-
git push origin main 2>/dev/null || log "Push failed (may need pull first)"
170+
git pull --rebase origin main 2>/dev/null || true
171+
git push origin main 2>/dev/null || log "Push failed"
171172

172173
log "=== evolution cycle completed ==="

0 commit comments

Comments
 (0)