@teambit/merge-lanes 1.0.379 → 1.0.381

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.379" tests="1" failures="0" errors="0" skipped="0">
+  <testsuite name="teambit.lanes/merge-lanes@1.0.381" 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

@@ -1149,7 +1149,7 @@
                   "line": 42,
                   "character": 3
                 },
-                "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
+                "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
                 "name": "mergeStrategy",
                 "type": {
                   "__schema": "TypeRefSchema",
@@ -1429,7 +1429,7 @@
                   "line": 56,
                   "character": 3
                 },
-                "signature": "(property) resolveUnrelated?: \"theirs\" | \"ours\" | \"manual\" | undefined",
+                "signature": "(property) resolveUnrelated?: \"manual\" | \"theirs\" | \"ours\" | undefined",
                 "name": "resolveUnrelated",
                 "type": {
                   "__schema": "TypeRefSchema",
@@ -3632,7 +3632,7 @@
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.379"
+    "version": "1.0.381"
   },
   "taggedModuleExports": []
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "1.0.379",
+  "version": "1.0.381",
   "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.379"
+    "version": "1.0.381"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -21,20 +21,20 @@
     "@teambit/component-id": "1.2.0",
     "@teambit/legacy.bit-map": "0.0.24",
     "@teambit/legacy.cli.prompts": "0.0.1",
-    "@teambit/logger": "0.0.1049",
-    "@teambit/scope": "1.0.379",
-    "@teambit/checkout": "1.0.379",
-    "@teambit/cli": "0.0.956",
+    "@teambit/logger": "0.0.1051",
+    "@teambit/scope": "1.0.381",
+    "@teambit/checkout": "1.0.381",
+    "@teambit/cli": "0.0.958",
     "@teambit/legacy.utils": "0.0.4",
-    "@teambit/global-config": "0.0.959",
-    "@teambit/merging": "1.0.379",
-    "@teambit/remove": "1.0.379",
-    "@teambit/config-merger": "0.0.246",
-    "@teambit/export": "1.0.379",
+    "@teambit/global-config": "0.0.961",
+    "@teambit/merging": "1.0.381",
+    "@teambit/remove": "1.0.381",
+    "@teambit/config-merger": "0.0.248",
+    "@teambit/export": "1.0.381",
     "@teambit/harmony.modules.get-basic-log": "0.0.1",
-    "@teambit/importer": "1.0.379",
-    "@teambit/lanes": "1.0.379",
-    "@teambit/workspace": "1.0.379"
+    "@teambit/importer": "1.0.381",
+    "@teambit/lanes": "1.0.381",
+    "@teambit/workspace": "1.0.381"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
@@ -45,7 +45,7 @@
     "@teambit/harmony.envs.core-aspect-env": "0.0.42",
     "@teambit/component.testing.mock-components": "0.0.226",
     "@teambit/harmony.testing.load-aspect": "0.0.221",
-    "@teambit/snapping": "1.0.379",
+    "@teambit/snapping": "1.0.381",
     "@teambit/workspace.testing.mock-workspace": "0.0.27"
   },
   "peerDependencies": {