{"id":675,"date":"2021-11-21T13:40:59","date_gmt":"2021-11-21T05:40:59","guid":{"rendered":"https:\/\/log.tanxiaodian.com\/?p=675"},"modified":"2021-11-21T14:07:25","modified_gmt":"2021-11-21T06:07:25","slug":"git%e5%88%86%e6%94%af%e7%ad%96%e7%95%a5","status":"publish","type":"post","link":"https:\/\/log.tanxiaodian.com\/?p=675","title":{"rendered":"git\u5206\u652f\u7b56\u7565"},"content":{"rendered":"\n

\u5206\u652f\u7b56\u7565<\/h3>\n\n\n\n

\u5728\u5b9e\u9645\u5f00\u53d1\u4e2d\uff0c\u6211\u4eec\u5e94\u8be5\u6309\u7167\u51e0\u4e2a\u57fa\u672c\u539f\u5219\u8fdb\u884c\u5206\u652f\u7ba1\u7406\uff1a<\/p>\n\n\n\n

\u9996\u5148\uff0cmaster<\/code>\u5206\u652f\u5e94\u8be5\u662f\u975e\u5e38\u7a33\u5b9a\u7684\uff0c\u4e5f\u5c31\u662f\u4ec5\u7528\u6765\u53d1\u5e03\u65b0\u7248\u672c\uff0c\u5e73\u65f6\u4e0d\u80fd\u5728\u4e0a\u9762\u5e72\u6d3b\uff1b<\/p>\n\n\n\n

\u90a3\u5728\u54ea\u5e72\u6d3b\u5462\uff1f\u5e72\u6d3b\u90fd\u5728dev<\/code>\u5206\u652f\u4e0a\uff0c\u4e5f\u5c31\u662f\u8bf4\uff0cdev<\/code>\u5206\u652f\u662f\u4e0d\u7a33\u5b9a\u7684\uff0c\u5230\u67d0\u4e2a\u65f6\u5019\uff0c\u6bd4\u59821.0\u7248\u672c\u53d1\u5e03\u65f6\uff0c\u518d\u628adev<\/code>\u5206\u652f\u5408\u5e76\u5230master<\/code>\u4e0a\uff0c\u5728master<\/code>\u5206\u652f\u53d1\u5e031.0\u7248\u672c\uff1b<\/p>\n\n\n\n

\u4f60\u548c\u4f60\u7684\u5c0f\u4f19\u4f34\u4eec\u6bcf\u4e2a\u4eba\u90fd\u5728dev<\/code>\u5206\u652f\u4e0a\u5e72\u6d3b\uff0c\u6bcf\u4e2a\u4eba\u90fd\u6709\u81ea\u5df1\u7684\u5206\u652f\uff0c\u65f6\u4e0d\u65f6\u5730\u5f80dev<\/code>\u5206\u652f\u4e0a\u5408\u5e76\u5c31\u53ef\u4ee5\u4e86\u3002<\/p>\n\n\n\n

\u6240\u4ee5\uff0c\u56e2\u961f\u5408\u4f5c\u7684\u5206\u652f\u770b\u8d77\u6765\u5c31\u50cf\u8fd9\u6837\uff1a<\/p>\n\n\n\n

\"\"<\/figure>\n\n\n\n

\u5c0f\u7ed3<\/h3>\n\n\n\n

Git\u5206\u652f\u5341\u5206\u5f3a\u5927\uff0c\u5728\u56e2\u961f\u5f00\u53d1\u4e2d\u5e94\u8be5\u5145\u5206\u5e94\u7528\u3002<\/p>\n\n\n\n

\u5408\u5e76\u5206\u652f\u65f6\uff0c\u52a0\u4e0a--no-ff<\/code>\u53c2\u6570\u5c31\u53ef\u4ee5\u7528\u666e\u901a\u6a21\u5f0f\u5408\u5e76\uff0c\u5408\u5e76\u540e\u7684\u5386\u53f2\u6709\u5206\u652f\uff0c\u80fd\u770b\u51fa\u6765\u66fe\u7ecf\u505a\u8fc7\u5408\u5e76\uff0c\u800cfast forward<\/code>\u5408\u5e76\u5c31\u770b\u4e0d\u51fa\u6765\u66fe\u7ecf\u505a\u8fc7\u5408\u5e76\u3002<\/p>\n\n\n\n

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

\u5c0f\u7ed3 <\/p>\n\n\n\n

\u4fee\u590dbug\u65f6\uff0c\u6211\u4eec\u4f1a\u901a\u8fc7\u521b\u5efa\u65b0\u7684bug\u5206\u652f\u8fdb\u884c\u4fee\u590d\uff0c\u7136\u540e\u5408\u5e76\uff0c\u6700\u540e\u5220\u9664\uff1b<\/p>\n\n\n\n

\u5f53\u624b\u5934\u5de5\u4f5c\u6ca1\u6709\u5b8c\u6210\u65f6\uff0c\u5148\u628a\u5de5\u4f5c\u73b0\u573agit stash<\/code>\u4e00\u4e0b\uff0c\u7136\u540e\u53bb\u4fee\u590dbug\uff0c\u4fee\u590d\u540e\uff0c\u518dgit stash pop<\/code>\uff0c\u56de\u5230\u5de5\u4f5c\u73b0\u573a\uff1b<\/p>\n\n\n\n

\u5728master\u5206\u652f\u4e0a\u4fee\u590d\u7684bug\uff0c\u60f3\u8981\u5408\u5e76\u5230\u5f53\u524ddev\u5206\u652f\uff0c\u53ef\u4ee5\u7528git cherry-pick <commit><\/code>\u547d\u4ee4\uff0c\u628abug\u63d0\u4ea4\u7684\u4fee\u6539\u201c\u590d\u5236\u201d\u5230\u5f53\u524d\u5206\u652f\uff0c\u907f\u514d\u91cd\u590d\u52b3\u52a8\u3002<\/p>\n\n\n\n

\u5c0f\u7ed3 <\/p>\n\n\n\n

\u67e5\u770b\u8fdc\u7a0b\u5e93\u4fe1\u606f\uff0c\u4f7f\u7528git remote -v\uff1b
\u672c\u5730\u65b0\u5efa\u7684\u5206\u652f\u5982\u679c\u4e0d\u63a8\u9001\u5230\u8fdc\u7a0b\uff0c\u5bf9\u5176\u4ed6\u4eba\u5c31\u662f\u4e0d\u53ef\u89c1\u7684\uff1b
\u4ece\u672c\u5730\u63a8\u9001\u5206\u652f\uff0c\u4f7f\u7528git push origin branch-name\uff0c\u5982\u679c\u63a8\u9001\u5931\u8d25\uff0c\u5148\u7528git pull\u6293\u53d6\u8fdc\u7a0b\u7684\u65b0\u63d0\u4ea4\uff1b
\u5728\u672c\u5730\u521b\u5efa\u548c\u8fdc\u7a0b\u5206\u652f\u5bf9\u5e94\u7684\u5206\u652f\uff0c\u4f7f\u7528git checkout -b branch-name origin\/branch-name\uff0c\u672c\u5730\u548c\u8fdc\u7a0b\u5206\u652f\u7684\u540d\u79f0\u6700\u597d\u4e00\u81f4\uff1b
\u5efa\u7acb\u672c\u5730\u5206\u652f\u548c\u8fdc\u7a0b\u5206\u652f\u7684\u5173\u8054\uff0c\u4f7f\u7528git branch –set-upstream branch-name origin\/branch-name\uff1b
\u4ece\u8fdc\u7a0b\u6293\u53d6\u5206\u652f\uff0c\u4f7f\u7528git pull\uff0c\u5982\u679c\u6709\u51b2\u7a81\uff0c\u8981\u5148\u5904\u7406\u51b2\u7a81\u3002<\/p>\n\n\n\n

\u8f6c\u81ea\u5ed6\u96ea\u5cf0\u8001\u5e08 \u5206\u652f\u7ba1\u7406\u7b56\u7565 – \u5ed6\u96ea\u5cf0\u7684\u5b98\u65b9\u7f51\u7ad9 (liaoxuefeng.com)<\/a><\/p>\n","protected":false},"excerpt":{"rendered":"

\u5206\u652f\u7b56\u7565 \u5728\u5b9e\u9645\u5f00\u53d1\u4e2d\uff0c\u6211\u4eec\u5e94\u8be5\u6309\u7167\u51e0\u4e2a\u57fa\u672c\u539f\u5219\u8fdb…<\/p>\n

Continue readinggit\u5206\u652f\u7b56\u7565<\/span><\/a><\/div>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":[],"categories":[115],"tags":[118],"_links":{"self":[{"href":"https:\/\/log.tanxiaodian.com\/index.php?rest_route=\/wp\/v2\/posts\/675"}],"collection":[{"href":"https:\/\/log.tanxiaodian.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/log.tanxiaodian.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/log.tanxiaodian.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/log.tanxiaodian.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=675"}],"version-history":[{"count":3,"href":"https:\/\/log.tanxiaodian.com\/index.php?rest_route=\/wp\/v2\/posts\/675\/revisions"}],"predecessor-version":[{"id":679,"href":"https:\/\/log.tanxiaodian.com\/index.php?rest_route=\/wp\/v2\/posts\/675\/revisions\/679"}],"wp:attachment":[{"href":"https:\/\/log.tanxiaodian.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=675"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/log.tanxiaodian.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=675"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/log.tanxiaodian.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=675"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}