Repository navigation
Conversation
doc-han
force-pushed
the
cli-merge-with-abort
branch
from
October 21, 2025 14:34
39db674 to
6b3b377
Compare
josephjclark
changed the base branch from
main
to
980-sandbox-add-versioning-and-version-history-checking
October 22, 2025 15:26
josephjclark
left a comment
josephjclark
left a comment
Collaborator
There was a problem hiding this comment.
Good - a couple of small comments but I think this is OK. More important that we get the base logic right.
I was expecting the validation to all be in the CLI. But I guess it's OK in the Project?
Base automatically changed from
980-sandbox-add-versioning-and-version-history-checking
to
release/next
October 24, 2025 14:29
Collaborator
|
Merge got hairy so I did this in #1094 |
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.
Short Description
Checks whether all workflows from the workflow-mapping of a merge are compatible before merging. if not we then throw an error to abort the merge.
Fixes #
Implementation Details
A more detailed breakdown of the changes, including motivations (if not provided in the issue).
QA Notes
List any considerations/cases/advice for testing/QA here.
AI Usage
Please disclose how you've used AI in this work (it's cool, we just want to know!):
You can read more details in our Responsible AI Policy
Release branch checklist
Delete this section if this is not a release PR.
If this IS a release branch:
pnpm changeset versionfrom root to bump versionspnpm installpnpm changeset tagto generate tagsgit push --tagsTags may need updating if commits come in after the tags are first generated.