TASK: Add force
strategy to the rebase workspace command
#4939
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.
This change allows to specify the error handling strategy for the rebaseWorkspace command and introduces a force option there. If no strategy is specified the
fail
strategy is uses which is the same behavior as before.Based on this the workspace:rebase command is extended with a new --force option that allows to rebase even workspaces in state OUTDATED_CONFLICT by ignoring all conflicting events and preserving the rest.
Partially solves: #4866 (cli part)
In addition the number of logged informations when a rebase failed is reduced to a sane size that does not grow exponentially. Resolves: #4545
Upgrade instructions
Review instructions
I suggest to add a
workspace:duplicate
command in a separate pr that can be run beforeworkspace:rebase --force
to keep the changes for later reference.Checklist
FEATURE|TASK|BUGFIX
!!!
and have upgrade-instructions