yarn.lockのコンフリクトを自動的に解消

概要

  • 大きめフィーチャーブランチを% git pull --rebaseしたら、yarn.lockが盛大にconflictした。
  • 「やっちまったー」と思ったけど、コマンド1発で解決してくれる仕組みがあった。
  • yarn install するだけで解決!!!!

以下のようなコンフリクトがあったけど、yarn install のみで綺麗に解決できた!
(抜粋)

diff --cc yarn.lock
index 59ab0fba,477b4a42..00000000
--- a/yarn.lock
+++ b/yarn.lock
@@@ -46,40 -10,53 +46,66 @@@
      esutils "^2.0.2"
      js-tokens "^3.0.0"

++< <<<<<< HEAD
 +"@babel/runtime@7.0.0-beta.42":
 +  version "7.0.0-beta.42"
 +  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0-beta.42.tgz#352e40c92e0460d3e82f49bd7e79f6cda76f919f"
++=======
+ "@babel/code-frame@^7.0.0":
+   version "7.0.0"
+   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+   dependencies:
+     "@babel/highlight" "^7.0.0"
+
+ "@babel/helper-function-name@7.0.0-beta.32":
+   version "7.0.0-beta.32"
+   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.32.tgz#6161af4419f1b4e3ed2d28c0c79c160e218be1f3"
++>>>>>>> origin/develop
    dependencies:
 -    "@babel/helper-get-function-arity" "7.0.0-beta.32"
 -    "@babel/template" "7.0.0-beta.32"
 -    "@babel/types" "7.0.0-beta.32"
 +    core-js "^2.5.3"
 +    regenerator-runtime "^0.11.1"

 -"@babel/helper-get-function-arity@7.0.0-beta.32":
 -  version "7.0.0-beta.32"
 -  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.32.tgz#93721a99db3757de575a83bab7c453299abca568"
 +"@babel/runtime@^7.0.0-beta.55":
 +  version "7.0.0-beta.56"
 +  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0-beta.56.tgz#cda612dffd5b1719a7b8e91e3040bd6ae64de8b0"
    dependencies:
 -    "@babel/types" "7.0.0-beta.32"
 +    regenerator-runtime "^0.12.0"

++< <<<<<< HEAD
 +"@babel/template@7.0.0-beta.44":
 +  version "7.0.0-beta.44"
 +  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
++=======
+ "@babel/highlight@^7.0.0":
+   version "7.0.0"
+   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+   dependencies:
+     chalk "^2.0.0"
+     esutils "^2.0.2"
+     js-tokens "^4.0.0"
+
+ "@babel/template@7.0.0-beta.32":
+   version "7.0.0-beta.32"
+   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.32.tgz#e1d9fdbd2a7bcf128f2f920744a67dab18072495"
++>>>>>>> origin/develop
    dependencies:
 -    "@babel/code-frame" "7.0.0-beta.32"
 -    "@babel/types" "7.0.0-beta.32"
 -    babylon "7.0.0-beta.32"
 +    "@babel/code-frame" "7.0.0-beta.44"
 +    "@babel/types" "7.0.0-beta.44"
 +    babylon "7.0.0-beta.44"
      lodash "^4.2.0"

 -"@babel/traverse@^7.0.0-beta.31":
 -  version "7.0.0-beta.32"
 -  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.32.tgz#b78b754c6e1af3360626183738e4c7a05951bc99"
 -  dependencies:
 -    "@babel/code-frame" "7.0.0-beta.32"
 -    "@babel/helper-function-name" "7.0.0-beta.32"
 -    "@babel/types" "7.0.0-beta.32"
 -    babylon "7.0.0-beta.32"
 -    debug "^3.0.1"
 -    globals "^10.0.0"
 +"@babel/traverse@7.0.0-beta.44":
 +  version "7.0.0-beta.44"
 +  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
 +  dependencies:
 +    "@babel/code-frame" "7.0.0-beta.44"
 +    "@babel/generator" "7.0.0-beta.44"
 +    "@babel/helper-function-name" "7.0.0-beta.44"
 +    "@babel/helper-split-export-declaration" "7.0.0-beta.44"
 +    "@babel/types" "7.0.0-beta.44"
 +    babylon "7.0.0-beta.44"
 +    debug "^3.1.0"
 +    globals "^11.1.0"
      invariant "^2.2.0"
      lodash "^4.2.0"

@@@ -219,13 -128,17 +241,23 @@@ acorn@^4.0.3
    version "4.0.13"
    resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"

++< <<<<<< HEAD
 +acorn@^5.0.0, acorn@^5.5.0:
 +  version "5.7.1"
 +  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8"
++=======
+ acorn@^5.0.0:

ソース記事

コメントのやりとりが面白い。


matsubokkuri

Please feel free to contact me via e-mail, twitter and facebook!

あわせて読みたい

コメントを残す