{"id":981,"date":"2019-10-24T08:56:11","date_gmt":"2019-10-24T00:56:11","guid":{"rendered":"https:\/\/jqnets.com\/blog\/?p=981"},"modified":"2019-10-24T08:56:11","modified_gmt":"2019-10-24T00:56:11","slug":"git-%e5%ad%b8%e7%bf%92%e6%89%8b%e5%86%8a12-remote%ef%bc%9agit-merge-conflict","status":"publish","type":"post","link":"https:\/\/jqnets.com\/blog\/git-%e5%ad%b8%e7%bf%92%e6%89%8b%e5%86%8a12-remote%ef%bc%9agit-merge-conflict\/","title":{"rendered":"Git \u5b78\u7fd2\u624b\u518a#12 Remote\uff1aGit Merge – Conflict"},"content":{"rendered":"

\u6628\u5929\u8b1b\u5230\u4e86 Git Merge\uff0c\u4f46\u5176\u5be6\u6628\u5929\u8b1b\u5230 Merge \u6642\u5019\uff0c\u6211\u5011\u523b\u610f\u4e0d\u4fee\u6b63\u6539\u540c\u4e00\u500b\u6a94\u6848\uff0c\u4f46\u5176\u5be6\u5728\u4e0d\u540c\u5206\u652f\uff0c\u662f\u975e\u5e38\u6709\u53ef\u80fd\u6703\u4fee\u6539\u5230\u540c\u4e00\u500b\u6a94\u6848\u7684\uff0c\u9019\u6642\u5019\u5c31\u5bb9\u6613\u6703\u767c\u751f\u300c\u885d\u7a81 ( Conflict )\u300d\uff0c\u6211\u5011\u4eca\u5929\u4e00\u6a23\uff0c\u6211\u5011\u900f\u904e\u5be6\u4f5c\u4f86\u7df4\u7fd2\u5b78\u7fd2\u5982\u4f55\u8655\u7406\u885d\u7a81\u554f\u984c\u3002<\/p>\n

 <\/p>\n

\u25a0\u00a0Git Merge (\u00a0Conflict )<\/span><\/strong><\/p>\n

 <\/p>\n

\u25c6 \u5be6\u4f5c\u7df4\u7fd2\uff1a\u5728\u4e0d\u540c\u5206\u652f\u4e0a\u5efa\u7acb\u540c\u4e00\u6a94\u6848<\/span><\/p>\n

 <\/p>\n

\u4e0a\u4f8b\u662f\u65b0\u589e\u5404\u5225\u4e0d\u4e00\u6a23\u7684\u6a94\u6848\uff0c\u6240\u4ee5\u5408\u4f75\u4e0a\u4e0d\u6703\u6709\u4efb\u4f55\u554f\u984c\uff0c\u63a5\u4e0b\u4f86\u6211\u5011\u4f86\u793a\u7bc4\u4e00\u4e0b\u6709\u4fee\u6539\u5230\u540c\u4e00\u500b\u6a94\u6848\uff0c\u5c0e\u81f4\u885d\u7a81\u7684\u60c5\u5f62\u3002<\/p>\n

 <\/p>\n

\u5047\u8a2d\u6211\u5011\u53c8\u65b0\u589e\u4e86\u4e00\u500b\u65b0\u7684\u5206\u652f\uff0cnew-bugfix<\/span>\uff0c\u4e26\u5728 new-bugfix \u4e0a\u4fee\u6539 one.txt ( \u65b0\u589e\u4e00\u884c new-bugfix in line )\u3002<\/p>\n

 <\/p>\n

# \u5275\u5efa\u4e14\u5207\u63db\u5230 new-bugfix\r\n\r\ngit checkout -b new-bugfix\r\n\r\necho \"this is a new-bugfix text\" >> one.txt\r\n\r\ngit add one.txt\r\n\r\ngit commit -m \"new-bugfix modify one.txt\"<\/pre>\n
 <\/p>\n
\u200c<\/p>\n
\u53e6\u5916\u5728 new-feature<\/span> \u4e5f\u540c\u6a23\u4fee\u6539 one.txt\u00a0( \u65b0\u589e\u4e00\u884c new-feature in line )\u3002<\/p>\n
git checkout new-feature\r\n\r\necho \"this is a new-feature text\" >> one.txt\r\n\r\ngit add one.txt\r\n\r\ngit commit -m\u00a0\"new-feature modify one.txt\"<\/pre>\n
 <\/p>\n
\u200c\u200c<\/p>\n
\u6211\u5011\u5207\u56de master<\/span> \u5206\u652f\uff0c\u5206\u4e14\u9010\u4e00\u5408\u4f75 new-feature \u5206\u652f\u548c new-bugfix \u5206\u652f\u3002<\/p>\n
git checkout\u00a0master\r\n\r\ngit marge\u00a0new-feature\r\n\r\ngit marge\u00a0new-bugfix<\/pre>\n
 <\/p>\n
\u200c\u200c<\/p>\n
\u5728\u5408\u4f75\u5230 new-bugfix \u7684\u6642\u5019\uff0c\u767c\u751f\u885d\u7a81\u932f\u8aa4<\/p>\n
 <\/p>\n
Auto-merging one.txt\r\n\r\nCONFLICT (content): Merge conflict in one.txt\r\n\r\nAutomatic merge failed; fix conflicts and then commit the result.<\/pre>\n
 <\/p>\n
\u200c<\/p>\n
\u6211\u5011\u9019\u6642\u5019\u57f7\u884c git status<\/span> \u6307\u4ee4\uff0c\u4f86\u770b\u770b\u51fa\u932f\u8a0a\u606f\u3002<\/p>\n
 <\/p>\n
git status<\/pre>\n
\"\"<\/p>\n
\u200c<\/p>\n
\u6211\u5011\u63a5\u8457\u53bb\u7de8\u8f2f one.txt \u9019\u500b\u6a94\u6848\u3002<\/p>\n
nano\u00a0one.txt<\/pre>\n
\"\"<\/p>\n
 <\/p>\n
\u6b64\u6642 one.txt \u00a0\u986f\u793a\u51fa\u885d\u7a81\u7684\u8a0a\u606f<\/p>\n
 <\/p>\n
\"\"<\/p>\n
 <\/p>\n
\u6211\u5011\u628a\u5b83\u4fee\u6539\u6210\u70ba\u6211\u5011\u8981\u7684\u5167\u5bb9<\/p>\n
\u6211\u5011\u518d\u4f86\u91cd\u65b0\u63d0\u4ea4\u4e00\u6b21\uff0c\u5c31\u9806\u5229\u5408\u4f75\u5b8c\u6210\u4e86\u3002<\/p>\n
 <\/p>\n
git add one.txt\r\n\r\ngit commit<\/pre>\n
----\r\n\r\n[master d266c1a] Merge branch 'new-bugfix'<\/pre>\n
 <\/p>\n
\u200c\u6700\u5f8c\u518d\u628a\u7d50\u679c push \u5230 GitHub\u3002<\/p>\n
 <\/p>\n
git push<\/pre>\n
 <\/p>\n
 <\/p>\n","protected":false},"excerpt":{"rendered":"
\u6628\u5929\u8b1b\u5230\u4e86 Git Merge\uff0c\u4f46\u5176\u5be6\u6628\u5929\u8b1b\u5230 Merge \u6642\u5019\uff0c\u6211\u5011\u523b\u610f\u4e0d\u4fee\u6b63\u6539\u540c\u4e00\u500b\u6a94\u6848\uff0c\u4f46\u5176\u5be6\u5728\u4e0d\u540c\u5206\u652f\uff0c\u662f\u975e\u5e38\u6709\u53ef\u80fd\u6703\u4fee\u6539\u5230\u540c\u4e00\u500b\u6a94\u6848\u7684\uff0c\u9019\u6642\u5019\u5c31\u5bb9\u6613\u6703\u767c\u751f\u300c\u885d\u7a81 ( Conflict )\u300d\uff0c\u6211\u5011\u4eca\u5929\u4e00\u6a23\uff0c\u6211\u5011\u900f\u904e\u5be6\u4f5c\u4f86\u7df4\u7fd2\u5b78\u7fd2\u5982\u4f55\u8655\u7406\u885d\u7a81\u554f\u984c\u3002   \u25a0\u00a0Git Merge (\u00a0Conflict )   \u25c6 \u5be6\u4f5c\u7df4\u7fd2\uff1a\u5728\u4e0d\u540c\u5206\u652f\u4e0a\u5efa\u7acb\u540c\u4e00\u6a94\u6848   \u4e0a\u4f8b\u662f\u65b0\u589e\u5404\u5225\u4e0d\u4e00\u6a23\u7684\u6a94\u6848\uff0c\u6240\u4ee5\u5408\u4f75\u4e0a\u4e0d\u6703\u6709\u4efb\u4f55\u554f\u984c\uff0c\u63a5\u4e0b\u4f86\u6211\u5011\u4f86\u793a\u7bc4\u4e00\u4e0b\u6709\u4fee\u6539\u5230\u540c\u4e00\u500b\u6a94\u6848\uff0c\u5c0e\u81f4\u885d\u7a81\u7684\u60c5\u5f62\u3002  […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"jetpack_post_was_ever_published":false,"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":false,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_memberships_contains_paid_content":false,"footnotes":"","jetpack_publicize_message":"","jetpack_publicize_feature_enabled":true,"jetpack_social_post_already_shared":true,"jetpack_social_options":{"image_generator_settings":{"template":"highway","enabled":false}}},"categories":[3,251],"tags":[308,271,307,305,273],"jetpack_publicize_connections":[],"jetpack_featured_media_url":"","jetpack_sharing_enabled":true,"jetpack_shortlink":"https:\/\/wp.me\/p6rhcT-fP","jetpack-related-posts":[],"jetpack_likes_enabled":false,"_links":{"self":[{"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/posts\/981"}],"collection":[{"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/comments?post=981"}],"version-history":[{"count":3,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/posts\/981\/revisions"}],"predecessor-version":[{"id":984,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/posts\/981\/revisions\/984"}],"wp:attachment":[{"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/media?parent=981"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/categories?post=981"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/tags?post=981"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}