Skip to content

Fetch before commit count in merge script#237

Merged
drn merged 1 commit intomasterfrom
argus/skill-improvement-handoff-merge
Mar 15, 2026
Merged

Fetch before commit count in merge script#237
drn merged 1 commit intomasterfrom
argus/skill-improvement-handoff-merge

Conversation

@drn
Copy link
Owner

@drn drn commented Mar 15, 2026

Extract do_fetch() from do_rebase() and call it before check_commits() so the commit count is computed against fresh origin/master. Prevents pushing stale commits and late rebase conflicts.

Co-Authored-By: Claude noreply@anthropic.com

Extract do_fetch() from do_rebase() and call it before check_commits()
so the commit count is computed against fresh origin/master rather than
a stale local ref. This prevents pushing stale commits and surfacing
rebase conflicts late in the merge flow.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@drn drn merged commit f30ba24 into master Mar 15, 2026
@drn drn deleted the argus/skill-improvement-handoff-merge branch March 15, 2026 22:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant