{"id":1642,"date":"2023-03-25T11:41:00","date_gmt":"2023-03-25T03:41:00","guid":{"rendered":""},"modified":"2023-03-25T11:41:00","modified_gmt":"2023-03-25T03:41:00","slug":"Git conflict","status":"publish","type":"post","link":"https:\/\/bianchenghao6.com\/1642.html","title":{"rendered":"Git conflict"},"content":{"rendered":"


\n <\/head>
\n <\/p>\n

\n

Git conflict<\/h1>\n<\/p><\/div>\n
\n \u5728Git\u4e2d\uff0c\u5408\u5e76\u662f\u8fde\u63a5\u5206\u652f\u5386\u53f2\u8bb0\u5f55\u7684\u8fc7\u7a0b\u3002\u5b83\u628a\u4e24\u4e2a\u6216\u591a\u4e2a\u5f00\u53d1\u5386\u53f2\u8054\u7cfb\u5728\u4e00\u8d77\u3002 git merge\u547d\u4ee4\u53ef\u5e2e\u52a9\u60a8\u83b7\u53d6git\u5206\u652f\u521b\u5efa\u7684\u6570\u636e\u5e76\u5c06\u5176\u96c6\u6210\u5230\u5355\u4e2a\u5206\u652f\u4e2d\u3002 Git\u5408\u5e76\u4f1a\u5c06\u4e00\u7cfb\u5217\u63d0\u4ea4\u5173\u8054\u5230\u4e00\u4e2a\u7edf\u4e00\u7684\u5386\u53f2\u8bb0\u5f55\u4e2d\u3002\u901a\u5e38\uff0cgit merge\u7528\u4e8e\u5408\u5e76\u4e24\u4e2a\u5206\u652f\u3002\n <\/div>\n

Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c1\u5f20 <\/p>\n

\n \u7528\u4e8e\u7ef4\u6301\u4e0d\u540c\u7684\u53d1\u5c55\u8def\u7ebf\uff1b\u5728\u67d0\u4e2a\u9636\u6bb5\uff0c\u60a8\u5e0c\u671b\u5c06\u66f4\u6539\u5408\u5e76\u5230\u4e00\u4e2a\u5206\u652f\u4e2d\u3002\n <\/div>\n
\n \u5728\u4e0a\u56fe\u4e2d\uff0c\u6709\u4e24\u4e2a\u5206\u652f master \u548c features \u3002\u6211\u4eec\u53ef\u4ee5\u770b\u5230\u6211\u4eec\u5728\u529f\u80fd\u548cmaster\u5206\u652f\u4e2d\u90fd\u8fdb\u884c\u4e86\u4e00\u4e9b\u63d0\u4ea4\uff0c\u5e76\u5c06\u5b83\u4eec\u5408\u5e76\u3002\u5b83\u7528\u4f5c\u6307\u9488\u3002\u5b83\u5c06\u5728\u5206\u652f\u4e4b\u95f4\u627e\u5230\u4e00\u4e2a\u5171\u540c\u7684\u57fa\u7840\u63d0\u4ea4\u3002\u4e00\u65e6Git\u627e\u5230\u4e00\u4e2a\u5171\u4eab\u7684\u57fa\u672c\u63d0\u4ea4\uff0c\u5b83\u5c06\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\"\u5408\u5e76\u63d0\u4ea4\"\u3002\u5b83\u7ed3\u5408\u4e86\u6bcf\u4e2a\u6392\u961f\u7684\u5408\u5e76\u63d0\u4ea4\u5e8f\u5217\u7684\u66f4\u6539\u3002\n <\/div>\n

\" git merge\"\u547d\u4ee4<\/h2>\n
\n git merge\u547d\u4ee4\u7528\u4e8e\u5408\u5e76\u5206\u652f\u3002\n <\/div>\n
\n git merge\u547d\u4ee4\u7684\u8bed\u6cd5\u5982\u4e0b:\n <\/div>\n
\n
$ git merge <query><\/pre>\n
<\/code>\n  <\/div>\n
\n    \u53ef\u4ee5\u5728\u5404\u79cd\u60c5\u51b5\u4e0b\u4f7f\u7528\u3002\u4e00\u4e9b\u5982\u4e0b:\n  <\/div>\n
\n    \u65b9\u68481: \u8981\u5c06\u6307\u5b9a\u7684\u63d0\u4ea4\u5408\u5e76\u5230\u5f53\u524d\u6d3b\u52a8\u7684\u5206\u652f\u4e2d:\n  <\/div>\n
\n    \u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5408\u5e76\u6307\u5b9a\u7684\u63d0\u4ea4\u5230\u5f53\u524d\u6d3b\u52a8\u7684\u5206\u652f\u3002\n  <\/div>\n
\n
$ git merge <commit><\/pre>\n
<\/code>\n  <\/div>\n
\n    \u4e0a\u9762\u7684\u547d\u4ee4\u4f1a\u5c06\u6307\u5b9a\u7684\u63d0\u4ea4\u5408\u5e76\u5230\u5f53\u524d\u6d3b\u52a8\u7684\u5206\u652f\u4e2d\u3002\u60a8\u8fd8\u53ef\u4ee5\u901a\u8fc7\u5728
\n   
\n     \u4e2d\u4f20\u5165\u5206\u652f\u540d\u79f0\u6765\u5c06\u6307\u5b9a\u7684\u63d0\u4ea4\u5408\u5e76\u5230\u6307\u5b9a\u7684\u5206\u652f\u3002\u8ba9\u6211\u4eec\u770b\u770b\u5982\u4f55\u63d0\u4ea4\u5230\u5f53\u524d\u6d3b\u52a8\u7684\u5206\u652f\u3002
\n   <\/commit>\n  <\/div>\n
\n    \u8bf7\u53c2\u89c1\u4e0b\u9762\u7684\u793a\u4f8b\u3002\u6211\u5bf9\u9879\u76ee\u7684\u6587\u4ef6 newfile1.txt \u8fdb\u884c\u4e86\u4e00\u4e9b\u66f4\u6539\uff0c\u5e76\u5c06\u5176\u63d0\u4ea4\u5230\u6211\u7684 test \u5206\u652f\u4e2d\u3002\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c2\u5f20 <\/p>\n
\n    \u590d\u5236\u8981\u5728\u6d3b\u52a8\u5206\u652f\u4e0a\u5408\u5e76\u7684\u7279\u5b9a\u63d0\u4ea4\u5e76\u6267\u884c\u5408\u5e76\u64cd\u4f5c\u3002\u53c2\u89c1\u4ee5\u4e0b\u8f93\u51fa:\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c3\u5f20 <\/p>\n
\n    \u5728\u4e0a\u9762\u7684\u8f93\u51fa\u4e2d\uff0c\u6211\u4eec\u5df2\u7ecf\u5728\u6d3b\u52a8\u5206\u652ftest2\u4e2d\u5408\u5e76\u4e86\u5148\u524d\u7684\u63d0\u4ea4\u3002\n  <\/div>\n
\n    \u65b9\u68482: \u8981\u5c06\u63d0\u4ea4\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e2d:\n  <\/div>\n
\n    To\u5c06\u6307\u5b9a\u7684\u63d0\u4ea4\u5408\u5e76\u5230\u4e3b\u63d0\u4ea4\u4e2d\uff0c\u9996\u5148\u53d1\u73b0\u5176\u63d0\u4ea4ID\u3002\u4f7f\u7528log\u547d\u4ee4\u67e5\u627e\u7279\u5b9a\u7684\u63d0\u4ea4ID\u3002\n  <\/div>\n
\n
$git log<\/pre>\n
<\/code>\n  <\/div>\n
\n    \u8bf7\u53c2\u89c1\u4ee5\u4e0b\u8f93\u51fa:\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c4\u5f20 <\/p>\n
\n    \u8981\u5c06\u63d0\u4ea4\u5408\u5e76\u5230master\u5206\u652f\u4e2d\uff0c\u8bf7\u5207\u6362\u5230master\u5206\u652f\u3002\n  <\/div>\n
\n
$ git checkout master<\/pre>\n
<\/code>\n  <\/div>\n
\n    \u73b0\u5728\uff0c\u5207\u6362\u5230\u5206\u652f\" master\"\u4ee5\u5bf9\u63d0\u4ea4\u6267\u884c\u5408\u5e76\u64cd\u4f5c\u3002\u4e0e\u4e3b\u5206\u652f\u540d\u79f0\u4e00\u8d77\u4f7f\u7528git merge\u547d\u4ee4\u3002\u8bed\u6cd5\u5982\u4e0b:\n  <\/div>\n
\n
$ git merge master<\/pre>\n
<\/code>\n  <\/div>\n
\n    \u8bf7\u53c2\u89c1\u4ee5\u4e0b\u8f93\u51fa:\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c5\u5f20 <\/p>\n
\n    \u5982\u4e0a\u9762\u7684\u8f93\u51fa\u6240\u793a\uff0c\u63d0\u4ea4ID\u4e3a 2852e020909dfe705707695fd6d715cd723f9540 \u7684\u63d0\u4ea4\u5df2\u5408\u5e76\u5230master\u5206\u652f\u4e2d\u3002 master\u5206\u652f\u4e2d\u6709\u4e24\u4e2a\u6587\u4ef6\u5df2\u66f4\u6539\u3002\u4f46\u662f\uff0c\u6211\u4eec\u5df2\u5728 test \u5206\u652f\u4e2d\u8fdb\u884c\u4e86\u6b64\u63d0\u4ea4\u3002\u56e0\u6b64\uff0c\u53ef\u4ee5\u5408\u5e76\u4efb\u4f55\u5206\u652f\u4e2d\u7684\u4efb\u4f55\u63d0\u4ea4\u3002\n  <\/div>\n
\n    \u6253\u5f00\u65b0\u6587\u4ef6\uff0c\u60a8\u4f1a\u6ce8\u610f\u5230\u6211\u4eec\u5df2\u7ecf\u63d0\u4ea4\u7ed9test\u5206\u652f\u7684\u65b0\u884c\u73b0\u5728\u5df2\u590d\u5236\u5230master\u5206\u652f\u4e0a\u3002\n  <\/div>\n
\n    \u573a\u666f3: Git\u5408\u5e76\u5206\u652f\u3002\n  <\/div>\n
\n    Git\u5141\u8bb8\u5c06\u6574\u4e2a\u5206\u652f\u5408\u5e76\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u4e2d\u3002\u5047\u8bbe\u60a8\u5728\u5206\u652f\u4e0a\u8fdb\u884c\u4e86\u8bb8\u591a\u66f4\u6539\uff0c\u5e76\u4e14\u5e0c\u671b\u4e00\u6b21\u5408\u5e76\u6240\u6709\u8fd9\u4e9b\u3002 Git\u5141\u8bb8\u60a8\u8fd9\u6837\u505a\u3002\u53c2\u89c1\u4ee5\u4e0b\u793a\u4f8b:\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c6\u5f20 <\/p>\n
\n    \u5728\u7ed9\u5b9a\u7684\u8f93\u51fa\u4e2d\uff0c\u6211\u5728\u6d4b\u8bd5\u5206\u652f\u7684newfile1\u4e2d\u8fdb\u884c\u4e86\u66f4\u6539\u3002\u73b0\u5728\uff0c\u6211\u5df2\u5728\u6d4b\u8bd5\u5206\u652f\u4e2d\u8fdb\u884c\u4e86\u6b64\u66f4\u6539\u3002\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c7\u5f20 <\/p>\n
\n    \u73b0\u5728\uff0c\u5207\u6362\u5230\u6240\u9700\u7684\u5206\u652f\u5408\u5e76\u3002\u5728\u7ed9\u5b9a\u7684\u793a\u4f8b\u4e2d\uff0c\u6211\u5df2\u5207\u6362\u5230master\u5206\u652f\u3002\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\uff0c\u5c06\u6574\u4e2a\u5206\u652f\u5408\u5e76\u5230\u6d3b\u52a8\u5206\u652f\u4e2d\u3002\n  <\/div>\n
\n
$ git merge <branchname><\/pre>\n
<\/code>\n  <\/div>\n
 
\n  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c8\u5f20 <\/p>\n
\n    \u4ece\u7ed9\u5b9a\u7684\u8f93\u51fa\u4e2d\u53ef\u4ee5\u770b\u5230\uff0c\u5206\u652ftest2\u7684\u5168\u90e8\u63d0\u4ea4\u5df2\u5408\u5e76\u5230\u5206\u652f\u4e3b\u670d\u52a1\u5668\u3002\n  <\/div>\n
 Git\u5408\u5e76\u51b2\u7a81<\/h2>\n
\n    \u5f53\u4e24\u4e2a\u5206\u652f\u8bd5\u56fe\u5408\u5e76\u65f6\uff0c\u4e24\u4e2a\u5206\u652f\u90fd\u540c\u65f6\u88ab\u7f16\u8f91\u5e76\u4e14\u5728\u540c\u4e00\u4e2a\u6587\u4ef6\u4e2d\uff0cGit\u5c06\u65e0\u6cd5\u8bc6\u522b\u8981\u8fdb\u884c\u66f4\u6539\u7684\u7248\u672c\u3002\u8fd9\u79cd\u60c5\u51b5\u79f0\u4e3a\u5408\u5e76\u51b2\u7a81\u3002\u5982\u679c\u53d1\u751f\u8fd9\u79cd\u60c5\u51b5\uff0c\u5b83\u5c06\u5728\u5408\u5e76\u63d0\u4ea4\u4e4b\u524d\u505c\u6b62\uff0c\u4ee5\u4fbf\u60a8\u53ef\u4ee5\u624b\u52a8\u89e3\u51b3\u51b2\u7a81\u3002\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c9\u5f20 <\/p>\n
\n    \u8ba9\u6211\u4eec\u901a\u8fc7\u4e00\u4e2a\u4f8b\u5b50\u6765\u7406\u89e3\u5b83\u3002\n  <\/div>\n
\n    \u5047\u8bbe\u6211\u7684\u8fdc\u7a0b\u5b58\u50a8\u5e93\u5df2\u88ab\u6211\u7684\u4e24\u4e2a\u56e2\u961f\u6210\u5458 user1 \u548cuser2 \u3002 user1\u5728\u6211\u7684\u9879\u76ee\u7d22\u5f15\u6587\u4ef6\u4e2d\u8fdb\u884c\u4e86\u5982\u4e0b\u66f4\u6539\u3002\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c10\u5f20 <\/p>\n
\n    \u501f\u52a9git add\u547d\u4ee4\u5728\u672c\u5730\u5b58\u50a8\u5e93\u4e2d\u5bf9\u5176\u8fdb\u884c\u66f4\u65b0\u3002\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c11\u5f20 <\/p>\n
\n    \u73b0\u5728\u63d0\u4ea4\u66f4\u6539\u5e76\u4f7f\u7528\u8fdc\u7a0b\u5b58\u50a8\u5e93\u8fdb\u884c\u66f4\u65b0\u3002\u53c2\u89c1\u4ee5\u4e0b\u8f93\u51fa:\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c12\u5f20 <\/p>\n
\n    \u73b0\u5728\uff0c\u6211\u7684\u9065\u63a7\u5668\u5b58\u50a8\u5e93\u5c06\u5982\u4e0b\u6240\u793a:\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c13\u5f20 <\/p>\n
\n    \u5b83\u5c06\u663e\u793a\n  <\/div>\n
\n    \u73b0\u5728\uff0c user2 \u540c\u65f6\u4e5f\u6309\u5982\u4e0b\u65b9\u5f0f\u66f4\u65b0\u7d22\u5f15\u6587\u4ef6\u3002\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c14\u5f20 <\/p>\n
\n    User2\u5df2\u6dfb\u52a0\u5e76\u63d0\u4ea4\u4e86\u672c\u5730\u5b58\u50a8\u5e93\u4e2d\u7684\u66f4\u6539\u3002\u4f46\u662f\uff0c\u5f53\u4ed6\u5c1d\u8bd5\u5c06\u5176\u63a8\u9001\u5230\u8fdc\u7a0b\u670d\u52a1\u5668\u65f6\uff0c\u5b83\u5c06\u5f15\u53d1\u9519\u8bef\u3002\u53c2\u89c1\u4ee5\u4e0b\u8f93\u51fa:\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c15\u5f20 <\/p>\n
\n    \u5728\u4e0a\u9762\u7684\u8f93\u51fa\u4e2d\uff0c\u670d\u52a1\u5668\u77e5\u9053\u8be5\u6587\u4ef6\u5df2\u7ecf\u66f4\u65b0\u5e76\u4e14\u672a\u4e0e\u5176\u4ed6\u5206\u652f\u5408\u5e76\u3002\u56e0\u6b64\uff0c\u63a8\u9001\u8bf7\u6c42\u88ab\u8fdc\u7a0b\u670d\u52a1\u5668\u62d2\u7edd\u3002\u5b83\u5c06\u5f15\u53d1\u9519\u8bef\u6d88\u606f\uff0c\u4f8b\u5982 [rejected]\u65e0\u6cd5\u5c06\u67d0\u4e9b\u5f15\u7528\u63a8\u9001\u5230
\n   
\n     \u3002\u5efa\u8bae\u60a8\u5728\u63a8\u9001\u4e4b\u524d\u5148\u62c9\u51fa\u5b58\u50a8\u5e93\u3002\u53c2\u89c1\u4ee5\u4e0b\u547d\u4ee4:
\n   <\/remote>\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c16\u5f20 <\/p>\n
\n    \u5728\u7ed9\u5b9a\u7684\u8f93\u51fa\u4e2d\uff0cgit rebase\u547d\u4ee4\u7528\u4e8e\u4ece\u8fdc\u7a0bURL\u4e2d\u63d0\u53d6\u5b58\u50a8\u5e93\u3002\u5728\u6b64\u5904\uff0c\u5b83\u5c06\u663e\u793a\u9519\u8bef\u6d88\u606f\uff0c\u4f8b\u5982\u5728
\n   
\n     \u4e2d\u5408\u5e76\u51b2\u7a81\u3002
\n   <\/filename>\n  <\/div>\n
\u89e3\u51b3\u51b2\u7a81: <\/h2>\n
\n    \u8981\u89e3\u51b3\u51b2\u7a81\uff0c\u6709\u5fc5\u8981\u77e5\u9053\u51b2\u7a81\u662f\u5426\u53d1\u751f\u4ee5\u53ca\u4e3a\u4ec0\u4e48\u53d1\u751f\u3002 Git merge\u5de5\u5177\u547d\u4ee4\u7528\u4e8e\u89e3\u51b3\u51b2\u7a81\u3002 merge\u547d\u4ee4\u7684\u7528\u6cd5\u5982\u4e0b:\n  <\/div>\n
\n
$ git mergetool<\/pre>\n
<\/code>\n  <\/div>\n
\n    \u5728\u6211\u7684\u5b58\u50a8\u5e93\u4e2d\uff0c\u5b83\u5c06\u5bfc\u81f4:\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c17\u5f20 <\/p>\n
\n    \u4ee5\u4e0a\u8f93\u51fa\u663e\u793a\u4e86\u51b2\u7a81\u6587\u4ef6\u7684\u72b6\u6001\u3002\u8981\u89e3\u51b3\u51b2\u7a81\uff0c\u53ea\u9700\u6309 I\u952e\u8fdb\u5165\u63d2\u5165\u6a21\u5f0f\uff0c\u7136\u540e\u6839\u636e\u9700\u8981\u8fdb\u884c\u66f4\u6539\u3002\u6309 Esc\u952e\uff0c\u9000\u51fa\u63d2\u5165\u6a21\u5f0f\u3002\u5728\u7f16\u8f91\u5668\u5e95\u90e8\u952e\u5165: w!\u4ee5\u4fdd\u5b58\u5e76\u9000\u51fa\u66f4\u6539\u3002\u8981\u63a5\u53d7\u66f4\u6539\uff0c\u8bf7\u4f7f\u7528rebase\u547d\u4ee4\u3002\u5b83\u5c06\u4f7f\u7528\u5982\u4e0b:\n  <\/div>\n
\n
$ git rebase--continue<\/span><\/pre>\n
<\/code>\n  <\/div>\n
\n    \u56e0\u6b64\uff0c\u51b2\u7a81\u5df2\u89e3\u51b3\u3002\u53c2\u89c1\u4ee5\u4e0b\u8f93\u51fa:\n  <\/div>\n
  Git conflict_https:\/\/bianchenghao6.com_\u3010Git \u6559\u7a0b\u3011_\u7b2c18\u5f20 <\/p>\n
\n    \u5728\u4e0a\u9762\u7684\u8f93\u51fa\u4e2d\uff0c\u51b2\u7a81\u5df2\u89e3\u51b3\uff0c\u672c\u5730\u5b58\u50a8\u5e93\u4e0e\u8fdc\u7a0b\u5b58\u50a8\u5e93\u540c\u6b65\u3002\n  <\/div>\n
\n    \u8981\u67e5\u770b\u6587\u4ef6\u4e2d\u5408\u5e76\u51b2\u7a81\u7684\u7b2c\u4e00\u4e2a\u7f16\u8f91\u6587\u672c\uff0c\u8bf7\u641c\u7d22\u5e26\u6709\u51b2\u7a81\u6807\u8bb0\u7684\u6587\u4ef6> <<<<<\u3002\u60a8\u53ef\u4ee5\u5728\u6587\u672c\u7f16\u8f91\u5668\u4e2d\u7684 <<<<<<<>>>>>> BRANCH-NAME \u3002\u5728\u4e0a\u9762\u7684\u793a\u4f8b\u4e2d\uff0cuser1\u5728\u57fa\u7840\u6216HEAD\u5206\u652f\u4e2d\u5199\u4e86\" <h1> Git\u7248\u672c\u63a7\u5236<\/h1>\"\uff0c\u800cuser2\u5728\u5199\u4e86\" <h2> Git\u662f\u7248\u672c\u63a7\u5236<\/h2>\"\u3002\n  <\/div>\n
\n    \u786e\u5b9a\u662f\u53ea\u4fdd\u7559\u5206\u652f\u7684\u66f4\u6539\u8fd8\u662f\u4fdd\u7559\u5176\u4ed6\u5206\u652f\u7684\u66f4\u6539\uff0c\u8fd8\u662f\u521b\u5efa\u65b0\u7684\u66f4\u6539\u3002\u5220\u9664\u51b2\u7a81\u6807\u8bb0 <<<<<<<\uff0c=======\uff0c>>>>>>> \u5e76\u521b\u5efa\u8981\u5408\u5e76\u7684\u6700\u7ec8\u66f4\u6539\u3002\n  <\/div>\n
\n
 <\/body>
\n<\/html><\/p>\n","protected":false},"excerpt":{"rendered":"Git conflictzh-cn","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[149],"tags":[],"class_list":["post-1642","post","type-post","status-publish","format-standard","hentry","category-gitjc"],"_links":{"self":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/posts\/1642"}],"collection":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/comments?post=1642"}],"version-history":[{"count":0,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/posts\/1642\/revisions"}],"wp:attachment":[{"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/media?parent=1642"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/categories?post=1642"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/bianchenghao6.com\/wp-json\/wp\/v2\/tags?post=1642"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}