feat(switch), introduce "--force-ours" and "--force-theirs" flags

e2e/harmony/lanes/switch-lanes.e2e.ts

@@ -384,4 +384,24 @@ describe('bit lane command', function () {
       expect(bitmap.comp1.version).to.equal(firstSnap);
     });
   });
+  describe('switch with --force-ours', () => {
+    before(() => {
+      helper.scopeHelper.setNewLocalAndRemoteScopes();
+      helper.fixtures.populateComponents(1);
+      helper.command.tagAllWithoutBuild();
+      helper.command.export();
+      helper.command.createLane();
+      helper.fixtures.populateComponents(1, undefined, 'v2');
+      helper.command.snapAllComponentsWithoutBuild();
+      helper.command.export();
+      helper.command.switchLocalLane('main', '-x --force-ours');
+    });
+    it('should switch successfully', () => {
+      helper.command.expectCurrentLaneToBe('main');
+    });
+    it('should not change the files and keep them same as the lane', () => {
+      const fileContent = helper.fs.readFile('comp1/index.js');
+      expect(fileContent).to.include('v2');
+    });
+  });
 });

scopes/lanes/lanes/lanes.main.runtime.ts

@@ -90,6 +90,8 @@ export type SwitchLaneOptions = {
   head?: boolean;
   alias?: string;
   merge?: MergeStrategy;
+  forceOurs?: boolean;
+  forceTheirs?: boolean;
   workspaceOnly?: boolean;
   pattern?: string;
   skipDependencyInstallation?: boolean;
@@ -562,7 +564,16 @@ please create a new lane instead, which will include all components of this lane
    */
   async switchLanes(
     laneName: string,
-    { alias, merge, pattern, workspaceOnly, skipDependencyInstallation = false, head }: SwitchLaneOptions
+    {
+      alias,
+      merge,
+      forceOurs,
+      forceTheirs,
+      pattern,
+      workspaceOnly,
+      skipDependencyInstallation = false,
+      head,
+    }: SwitchLaneOptions
   ) {
     if (!this.workspace) {
       throw new BitError(`unable to switch lanes outside of Bit workspace`);
@@ -588,6 +599,8 @@ please create a new lane instead, which will include all components of this lane
     };
     const checkoutProps = {
       mergeStrategy,
+      forceOurs,
+      forceTheirs,
       skipNpmInstall: skipDependencyInstallation,
       isLane: true,
       promptMergeOptions: false,

scopes/lanes/lanes/switch.cmd.ts

@@ -24,6 +24,8 @@ export class SwitchCmd implements Command {
       'auto-merge-resolve <merge-strategy>',
       'merge local changes with the checked out version. strategy should be "theirs", "ours" or "manual"',
     ],
+    ['', 'force-ours', 'do not merge, preserve local files as is'],
+    ['', 'force-theirs', 'do not merge, just overwrite with incoming files'],
     ['a', 'get-all', 'DEPRECATED. this is currently the default behavior'],
     ['', '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'],
@@ -50,6 +52,8 @@ ${COMPONENT_PATTERN_HELP}`,
       head,
       alias,
       autoMergeResolve,
+      forceOurs,
+      forceTheirs,
       getAll = false,
       workspaceOnly = false,
       skipDependencyInstallation = false,
@@ -59,6 +63,8 @@ ${COMPONENT_PATTERN_HELP}`,
       head?: boolean;
       alias?: string;
       autoMergeResolve?: MergeStrategy;
+      forceOurs?: boolean;
+      forceTheirs?: boolean;
       getAll?: boolean;
       workspaceOnly?: boolean;
       skipDependencyInstallation?: boolean;
@@ -71,6 +77,8 @@ ${COMPONENT_PATTERN_HELP}`,
       head,
       alias,
       merge: autoMergeResolve,
+      forceOurs,
+      forceTheirs,
       workspaceOnly,
       pattern,
       skipDependencyInstallation,