@teambit/merge-lanes 1.0.509 → 1.0.510

package/artifacts/__bit_junit.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="1" failures="0" errors="0" skipped="0">
-  <testsuite name="teambit.lanes/merge-lanes@1.0.509" tests="1" failures="0" errors="0" skipped="0">
+  <testsuite name="teambit.lanes/merge-lanes@1.0.510" tests="1" failures="0" errors="0" skipped="0">
     <testcase classname="dist/merge-lane.spec.js" name="should merge successfully the specified pattern only" time="0.001"/>
   </testsuite>
 </testsuites>

package/artifacts/schema.json

@@ -1151,7 +1151,7 @@
                   "line": 41,
                   "character": 3
                 },
-                "signature": "(property) mergeStrategy: \"ours\" | \"theirs\" | \"manual\"",
+                "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
                 "name": "mergeStrategy",
                 "type": {
                   "__schema": "TypeRefSchema",
@@ -1451,7 +1451,7 @@
                   "line": 56,
                   "character": 3
                 },
-                "signature": "(property) resolveUnrelated?: \"ours\" | \"theirs\" | \"manual\" | undefined",
+                "signature": "(property) resolveUnrelated?: \"theirs\" | \"ours\" | \"manual\" | undefined",
                 "name": "resolveUnrelated",
                 "type": {
                   "__schema": "TypeRefSchema",
@@ -3758,7 +3758,7 @@
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.509"
+    "version": "1.0.510"
   },
   "taggedModuleExports": []
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "1.0.509",
+  "version": "1.0.510",
   "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.509"
+    "version": "1.0.510"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -19,28 +19,28 @@
     "@teambit/lane-id": "0.0.311",
     "@teambit/harmony": "0.4.6",
     "@teambit/component-id": "1.2.2",
-    "@teambit/legacy.bit-map": "0.0.73",
+    "@teambit/legacy.bit-map": "0.0.74",
     "@teambit/legacy.cli.prompts": "0.0.9",
-    "@teambit/legacy.consumer": "0.0.16",
-    "@teambit/legacy.scope": "0.0.16",
-    "@teambit/logger": "0.0.1179",
-    "@teambit/scope.objects": "0.0.16",
-    "@teambit/scope": "1.0.509",
-    "@teambit/checkout": "1.0.509",
-    "@teambit/cli": "0.0.1086",
+    "@teambit/legacy.consumer": "0.0.17",
+    "@teambit/legacy.scope": "0.0.17",
+    "@teambit/logger": "0.0.1180",
+    "@teambit/scope.objects": "0.0.17",
+    "@teambit/scope": "1.0.510",
+    "@teambit/checkout": "1.0.510",
+    "@teambit/cli": "0.0.1087",
     "@teambit/legacy.utils": "0.0.12",
-    "@teambit/global-config": "0.0.1089",
+    "@teambit/global-config": "0.0.1090",
     "@teambit/legacy.constants": "0.0.4",
-    "@teambit/merging": "1.0.509",
-    "@teambit/remove": "1.0.509",
-    "@teambit/component.snap-distance": "0.0.17",
-    "@teambit/config-merger": "0.0.376",
-    "@teambit/export": "1.0.509",
+    "@teambit/merging": "1.0.510",
+    "@teambit/remove": "1.0.510",
+    "@teambit/component.snap-distance": "0.0.18",
+    "@teambit/config-merger": "0.0.377",
+    "@teambit/export": "1.0.510",
     "@teambit/harmony.modules.feature-toggle": "0.0.12",
-    "@teambit/harmony.modules.get-basic-log": "0.0.17",
-    "@teambit/importer": "1.0.509",
-    "@teambit/lanes": "1.0.509",
-    "@teambit/workspace": "1.0.509"
+    "@teambit/harmony.modules.get-basic-log": "0.0.18",
+    "@teambit/importer": "1.0.510",
+    "@teambit/lanes": "1.0.510",
+    "@teambit/workspace": "1.0.510"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
@@ -48,10 +48,10 @@
     "chai": "4.3.0",
     "@types/mocha": "9.1.0",
     "@teambit/harmony.envs.core-aspect-env": "0.0.65",
-    "@teambit/component.testing.mock-components": "0.0.276",
-    "@teambit/harmony.testing.load-aspect": "0.0.271",
-    "@teambit/snapping": "1.0.509",
-    "@teambit/workspace.testing.mock-workspace": "0.0.43"
+    "@teambit/component.testing.mock-components": "0.0.277",
+    "@teambit/harmony.testing.load-aspect": "0.0.272",
+    "@teambit/snapping": "1.0.510",
+    "@teambit/workspace.testing.mock-workspace": "0.0.44"
   },
   "peerDependencies": {
     "@types/chai": "4.3.19"