backend exposes workspace commit merge-failures to frontend #8333
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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
2 tasks
Byron
changed the title
… the return value The idea is that top-level merge-conflicts are observable, and we match the diffspecs against them. This allows the frontend to respond to it.
Byron
force-pushed
the
merge-conflict-handling
branch
from
d82bfa6 to
5e65223
Compare
estib-vega
reviewed
Apr 29, 2025
| | 'MissingDiffSpecAssociation'; | ||
|
|
||
| export type CreateCommitOutcome = { | ||
| newCommit: string; |
There was a problem hiding this comment.
Is the newCommit optional still? If so this probably should be newCommit: string | null
There was a problem hiding this comment.
That's a great catch! Indeed it is optional, but I forgot to adjust the type.
|
The rest looks good, so I'll just merge it and make the adaptions on my side |
|
Thanks again for the changes :) |
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.
The idea is that top-level merge-conflicts are observable, and we match the diffspecs against them. This allows the frontend to respond to it.
Related to #8331.
Tasks