From d574c3d1bd0cef78ae4b0427fbec070c2e3fee46 Mon Sep 17 00:00:00 2001
From: David First <davidnet@gmail.com>
Date: Mon, 15 Apr 2024 13:46:17 +0000
Subject: [PATCH] fix(switch), rename --merge to --auto-merge-resolve to be
 aligned with other commands (#8782)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is also needed because in case of a conflict it throws an error
with the following message:

> please use “--auto-merge-resolve” with ‘manual’, ‘ours’ or ‘theirs’ to
resolve the conflict/s

which was correct for many commands such as `bit checkout`, `bit lane
merge`, but not for `bit switch`.
---
 scopes/lanes/lanes/switch.cmd.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scopes/lanes/lanes/switch.cmd.ts b/scopes/lanes/lanes/switch.cmd.ts
index fc72d29cb5ec..9fe0712c5ff4 100644
--- a/scopes/lanes/lanes/switch.cmd.ts
+++ b/scopes/lanes/lanes/switch.cmd.ts
@@ -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',
@@ -48,7 +48,7 @@ ${COMPONENT_PATTERN_HELP}`,
     [lane]: [string],
     {
       alias,
-      merge,
+      autoMergeResolve,
       getAll = false,
       workspaceOnly = false,
       skipDependencyInstallation = false,
@@ -56,7 +56,7 @@ ${COMPONENT_PATTERN_HELP}`,
       json = false,
     }: {
       alias?: string;
-      merge?: MergeStrategy;
+      autoMergeResolve?: MergeStrategy;
       getAll?: boolean;
       workspaceOnly?: boolean;
       skipDependencyInstallation?: boolean;
@@ -67,7 +67,7 @@ ${COMPONENT_PATTERN_HELP}`,
   ) {
     const { components, failedComponents, installationError, compilationError } = await this.lanes.switchLanes(lane, {
       alias,
-      merge,
+      merge: autoMergeResolve,
       workspaceOnly,
       pattern,
       skipDependencyInstallation,