standardize wording of failed delete/update/upgrade/merge - #5953
Merged
Conversation
mitchellwrosen
commented
Oct 27, 2025
| else Output.CantDoThatDuring "an upgrade" "upgrade" | ||
| when projectAndBranch.branch.isUpdate (Cli.returnEarly (Output.CantDoThatDuring "an update" "update")) | ||
| when projectAndBranch.branch.isUpgrade (Cli.returnEarly (Output.CantDoThatDuring "an upgrade" "upgrade")) | ||
| when projectAndBranch.branch.isUpgrade (Cli.returnEarly (Output.CantDoThatDuring "a merge" "merge")) |
Member
Author
There was a problem hiding this comment.
Small oversight fixed, can't delete during a merge either
mitchellwrosen
marked this pull request as ready for review
October 27, 2025 15:16
aryairani
requested changes
Oct 27, 2025
aryairani
left a comment
aryairani
left a comment
Contributor
There was a problem hiding this comment.
Awesome; I left one formatting note. Also would you create a megaticket for the various combinations of incompatible operations; e.g. delete during merge.
| definitions to scratch.u, where you can fix them up or remove | ||
| any that are obsolete. | ||
|
|
||
| Once you're happy with the results, use`update`to merge them back intomain,or`cancel`if you change your mind. |
Contributor
There was a problem hiding this comment.
Some kind of spacing / wrapping issue here
Member
Author
|
@aryairani Fixed |
aryairani
approved these changes
Oct 28, 2025
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
2 participants
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.
Overview
This PR standardizes the wording of failed delete/update/upgrade/merge messages, as suggested in #5894