metrics: rebase-and-retry the commit-back push#13
Merged
Conversation
The metrics run takes several minutes; if master advances meanwhile (e.g. a PR is merged), the bot's push is rejected with 'fetch first'. Rebase onto origin/master and retry the push a few times.
christiankissig
added a commit
that referenced
this pull request
Jul 7, 2026
* metrics: rebase-and-retry the commit-back push The metrics run takes several minutes; if master advances meanwhile (e.g. a PR is merged), the bot's push is rejected with 'fetch first'. Rebase onto origin/master and retry the push a few times. * ci: trigger
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The first live metrics run did everything correctly (fetched the AFP, measured, updated the README) but the final commit-back push was rejected —
masteradvanced during the ~10-minute run (PR #11 was merged meanwhile), so the bot's commit was based on stalemaster(! [rejected] ... (fetch first)).Fix: after committing, rebase onto
origin/masterand retry the push a few times, so a concurrent merge during the run doesn't fail the job.(Metrics-vs-metrics overlap is already prevented by the
concurrencygroup; this handles metrics-vs-human-merge.)🤖 Generated with Claude Code