Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(switch), rename --merge to --auto-merge-resolve to be aligned with other commands #8782

Merged
merged 1 commit into from
Apr 15, 2024
Merged

fix(switch), rename --merge to --auto-merge-resolve to be aligned with other commands #8782

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions scopes/lanes/lanes/switch.cmd.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ export class SwitchCmd implements Command {
"relevant when the specified lane is a remote lane. create a local alias for the lane (doesnt affect the lane's name on the remote",
],
[
'm',
'merge [strategy]',
'',
'auto-merge-resolve <merge-strategy>',
'merge local changes with the checked out version. strategy should be "theirs", "ours" or "manual"',
],
['a', 'get-all', 'DEPRECATED. this is currently the default behavior'],
['a', 'workspace-only', 'checkout only the components in the workspace to the selected lane'],
['', 'workspace-only', 'checkout only the components in the workspace to the selected lane'],
['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'],
[
'p',
Expand All @@ -48,15 +48,15 @@ ${COMPONENT_PATTERN_HELP}`,
[lane]: [string],
{
alias,
merge,
autoMergeResolve,
getAll = false,
workspaceOnly = false,
skipDependencyInstallation = false,
pattern,
json = false,
}: {
alias?: string;
merge?: MergeStrategy;
autoMergeResolve?: MergeStrategy;
getAll?: boolean;
workspaceOnly?: boolean;
skipDependencyInstallation?: boolean;
Expand All @@ -67,7 +67,7 @@ ${COMPONENT_PATTERN_HELP}`,
) {
const { components, failedComponents, installationError, compilationError } = await this.lanes.switchLanes(lane, {
alias,
merge,
merge: autoMergeResolve,
workspaceOnly,
pattern,
skipDependencyInstallation,
Expand Down