{"id":1031,"date":"2019-11-08T02:36:21","date_gmt":"2019-11-07T17:36:21","guid":{"rendered":"https:\/\/took.jp\/?p=1031"},"modified":"2020-06-25T04:12:29","modified_gmt":"2020-06-24T19:12:29","slug":"post-1031","status":"publish","type":"post","link":"https:\/\/took.jp\/tech-blog\/post-1031\/","title":{"rendered":"Git \u30d0\u30a4\u30ca\u30ea\u30d5\u30a1\u30a4\u30eb\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u8d77\u304d\u305f\u6642\u306e\u89e3\u6c7a\u6cd5\u3010Cannot merge binary files\u3011"},"content":{"rendered":"

Git\u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30fc\u30b8\u3057\u305f\u3068\u304d\u306b\u3001\u30d0\u30a4\u30ca\u30ea\u30d5\u30a1\u30a4\u30eb\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3067\u30a8\u30e9\u30fc\u3092\u5410\u304d\u307e\u3057\u305f\u3002<\/p>\n

\r\n\r\n-bash-4.2$ sudo git merge \u30d6\u30e9\u30f3\u30c1\u540d\r\nwarning: Cannot merge binary files: \u30d5\u30a1\u30a4\u30eb\u540d (HEAD vs. \u30d6\u30e9\u30f3\u30c1\u540d)\r\nAuto-merging \u30d5\u30a1\u30a4\u30eb\u540d\r\nCONFLICT (content): Merge conflict in \u30d5\u30a1\u30a4\u30eb\u540d<\/code><\/pre>\n
 <\/p>\n
\u79c1\u306e\u5834\u5408\u3001zip\u30d5\u30a1\u30a4\u30eb\u3092\u5165\u308c\u66ff\u3048\u305f\u3068\u3053\u308d\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u8d77\u3053\u3057\u3066\u3057\u307e\u3063\u305f\u3088\u3046\u3067\u3059\u3002<\/p>\n
 <\/p>\n
\u3053\u306e\u6642\u306b\u4eee\u306b\u3001staging\u306b\u5bfe\u3057\u3001feature\u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30fc\u30b8\u3057\u305f\u3044\u306e\u3060\u3068\u3057\u307e\u3059\u3002<\/p>\n
\u305d\u3046\u3057\u305f\u5834\u5408\u3001feature\u3067zip\u30d5\u30a1\u30a4\u30eb\u3092\u65b0\u305f\u306a\u5185\u5bb9\u306b\u66f4\u65b0\u3057\u3066\u3044\u308b\u305f\u3081\u3001staging\u306b\u3042\u308b\u904e\u53bb\u306ezip\u306f\u7834\u68c4\u3057\u3066\u3001feature\u306ezip\u3092\u3042\u3052\u308b\u3088\u3046\u64cd\u4f5c\u3057\u307e\u3059\u3002<\/p>\n
 <\/p>\n
\u305d\u3046\u3057\u305f\u5834\u5408\u306b\u4fbf\u5229\u306a\u30b3\u30de\u30f3\u30c9\u304c\u3053\u3061\u3089\u3067\u3059\u3002<\/p>\n
git checkout --theirs \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u540d<\/code><\/pre>\n
 <\/p>\n
\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3060\u3051\u3067\u3059\u3002<\/p>\n
 <\/p>\n
\u4ed6\u306e\u90e8\u5206\u306e\u7af6\u5408\u3082\u78ba\u8a8d\u3057\u3001\u89e3\u6c7a\u3057\u3066\u3044\u308b\u3088\u3046\u306a\u3089\u3001<\/p>\n
git add --all\r\ngit commit -m '\u30b3\u30e1\u30f3\u30c8'\r\ngit push<\/code><\/pre>\n
 <\/p>\n
\u3068\u3057\u3066\u3084\u308b\u3060\u3051\u3067\u5b8c\u4e86\u3067\u3059\u3002<\/p>\n
 <\/p>\n
\u95a2\u9023\u66f8\u7c4d<\/h2>\n
\n\t
\n\t\t
\n\t\t\t\t\t\t\t<\/a>\t\t\t\t\t<\/div>\n\t\t
\n\t\t\t
\n\t\t\t\t\t\t\t\t\tGitHub\u5b9f\u8df5\u5165\u9580 \u301cPull Request\u306b\u3088\u308b\u958b\u767a\u306e\u5909\u9769 Pull\u3000Request\u306b\u3088\u308b\u958b\u767a\u306e\u5909\u9769 \uff08WEB+DB PRESS plus\uff09 [ \u5927\u585a\u5f18\u8a18 ]<\/a>\t\t\t\t\t\t\t<\/div>\n\t\t\t
\n\t\t\t\t\t\t\t
created by Rinker<\/a><\/div>\n\t\t\t\t\t\t\t\t\t\t
\n\t\t\t\t\t\t\t\u00a52,838<\/span>\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(2026\/04\/11 23:38:11\u6642\u70b9 \u697d\u5929\u5e02\u5834\u8abf\u3079-<\/span>\u8a73\u7d30)<\/span>\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t<\/div>\n\t\t\t\t\t\t<\/div>\n\t\t\t\t\t\t