Logic: Remove empty commits during rebase#309
Merged
OpsBotPrime merged 5 commits intomasterfrom Mar 27, 2026
Merged
Conversation
Author
|
CI disk is full. We have some magic incantations to fix this, which I will have to lookup. |
Author
|
@OpsBotPrime merge! |
We are seeing empty commits from CoPilot being merged to master. We want to just drop these commits from the history when rebasing on top of master. XRef: https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---no-keep-empty
…erged without that commit surviving
Approved-by: ReinierMaas Priority: Normal Auto-deploy: false
|
Rebased as 797dd79, waiting for CI … |
|
CI job 🟡 started. |
OpsBotPrime
force-pushed
the
reinier/remove-empty-commit-during-rebase
branch
from
ce4a576 to
797dd79
Compare
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
3 participants
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.
We are seeing empty commits from CoPilot being merged to master. We want to just drop these commits from the history when rebasing on top of master.
XRef: https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---no-keep-empty