fix(ci): handle missing MERGE_HEAD in staging conflict check#7273
Merged
fix(ci): handle missing MERGE_HEAD in staging conflict check#7273
Conversation
When staging already contains main (Already up to date), git merge --no-commit --no-ff succeeds without creating a MERGE_HEAD. The subsequent git merge --abort then fails with exit code 128. Fall back to git reset --hard HEAD when merge --abort fails.
Contributor
Dependency Review✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.Scanned FilesNone |
This was referenced Feb 25, 2026
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
1 participant
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
Validate Staging→Main PR / Lint and Testfailing withfatal: There is no merge to abort (MERGE_HEAD missing)(exit code 128)git merge --no-commit --no-ff origin/mainreturns "Already up to date" without creating aMERGE_HEAD. The subsequentgit merge --abortthen fails because there's nothing to abort.git reset --hard HEADwhengit merge --abortfails, covering both the success (no conflicts) and failure (conflicts) paths.Test plan
Validate Staging→Main PRon PR Production Release: 2 features, 3 fixes, 1 chore → Main #7268 after this merges to dev → staging