Repository navigation
fix(ci): reuse the head tree when a sync conflict resolves to it - #259
Merged
Merged
Conversation
When a newer spec PR already contains every change an older sibling merged to main, resolving the .last-synced-sha conflict yields the PR's own head tree. uploadTree then POSTed an empty `tree` list to the Git Trees API, which GitHub rejects with 422 "Invalid tree info", so resolve-sync-conflicts crashed (#243 on Oct 28, #258 today) and left the PR conflicting until a human stepped in. Skip the upload when the diff against the head is empty and build the merge commit from the head tree directly.
Contributor
 [Medium impact] The PR appears safe to merge. SummaryReuses the PR head tree when resolving
Reviews (1) · Last reviewed commit: "fix(ci): reuse the head tree when a sync..." · Reviewed by Greptile |
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.
When a newer spec PR already contains every change an older sibling merged
to main, resolving the .last-synced-sha conflict yields the PR's own head
tree. uploadTree then POSTed an empty
treelist to the Git Trees API,which GitHub rejects with 422 "Invalid tree info", so resolve-sync-conflicts
crashed (#243 on Oct 28, #258 today) and left the PR conflicting until a
human stepped in.
Skip the upload when the diff against the head is empty and build the
merge commit from the head tree directly.