Report git's stderr when a merge fails without leaving conflicts - #63
Merged
Conversation
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.
The repin bot reported this for ggml-org#24423:
Which is not a thing that can happen.
git mergereturned non-zero, thenadditive_merge.pyfound nothing in--diff-filter=U, and the placeholder for "there were no conflicted files" got rendered as though it were the reason the conflict could not be resolved.I could not reproduce it locally: against today's base the same merge succeeds cleanly with
Merge made by the 'ort' strategy. So whatever git objected to on the runner was environmental rather than a real conflict, and the one piece of evidence that would have identified it, git's stderr, was being thrown away.Now when the merge fails and leaves no conflicted files, the report carries the last few lines of git's actual output instead of a placeholder. The genuine-conflict path is unchanged, and
-is filtered out of the file list so it can no longer be printed as a filename.This is the same failure shape as the alerting bug in #62: a diagnostic that reported something other than what happened, which cost more time than the underlying fault would have. Tests still pass (14 assertions).