@teambit/git 1.0.284 → 1.0.286

package/artifacts/__bit_junit.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="0" failures="0" errors="0" skipped="0">
-  <testsuite name="teambit.git/git@1.0.284" tests="0" failures="0" errors="0" skipped="0"/>
+  <testsuite name="teambit.git/git@1.0.286" tests="0" failures="0" errors="0" skipped="0"/>
 </testsuites>

package/artifacts/schema.json

@@ -462,7 +462,7 @@
                 "line": 28,
                 "character": 3
               },
-              "signature": "(property) GitExtWorkspaceConfig.mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
+              "signature": "(property) GitExtWorkspaceConfig.mergeStrategy: \"manual\" | \"ours\" | \"theirs\"",
               "name": "mergeStrategy",
               "type": {
                 "__schema": "TypeUnionSchema",
@@ -1169,7 +1169,7 @@
   "componentId": {
     "scope": "teambit.git",
     "name": "git",
-    "version": "1.0.284"
+    "version": "1.0.286"
   },
   "taggedModuleExports": []
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/git",
-  "version": "1.0.284",
+  "version": "1.0.286",
   "homepage": "https://bit.cloud/teambit/git/git",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.git",
     "name": "git",
-    "version": "1.0.284"
+    "version": "1.0.286"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -15,7 +15,7 @@
     "@teambit/harmony": "0.4.6",
     "@teambit/bit-error": "0.0.404",
     "@teambit/cli": "0.0.865",
-    "@teambit/workspace": "1.0.284"
+    "@teambit/workspace": "1.0.286"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",