{"id":20136,"date":"2024-11-19T15:24:28","date_gmt":"2024-11-19T07:24:28","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20136\/"},"modified":"2024-11-19T15:24:28","modified_gmt":"2024-11-19T07:24:28","slug":"git%e6%80%8e%e4%b9%88%e6%98%af%e4%b8%8d%e6%98%af%e4%b8%bb%e5%88%86%e6%94%af","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20136\/","title":{"rendered":"git\u600e\u4e48\u662f\u4e0d\u662f\u4e3b\u5206\u652f"},"content":{"rendered":"<p>\u5728\u9879\u76ee\u5f00\u53d1\u4e2d\uff0cgit\u662f\u975e\u5e38\u5e38\u7528\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\u3002 \u5728git\u4e2d\uff0c\u5206\u652f(branch)\u662f\u4e00\u4e2a\u81f3\u5173\u91cd\u8981\u7684\u6982\u5ff5\u3002\u5b83\u5141\u8bb8\u5728\u540c\u4e00\u4ee3\u7801\u5e93\u4e2d\u8fdb\u884c\u591a\u4e2a\u5e76\u884c\u5f00\u53d1\uff0c\u5e76\u4e14\u53ef\u4ee5\u907f\u514d\u5f00\u53d1\u8fc7\u7a0b\u4e2d\u7684\u51b2\u7a81\u548c\u9519\u8bef\u3002\u5728\u8fd9\u7bc7\u6587\u7ae0\u4e2d\uff0c\u6211\u4eec\u5c06\u5b66\u4e60\u5982\u4f55\u5728git\u4e2d\u4f7f\u7528\u5206\u652f\uff0c\u5e76\u4e14\u89e3\u91ca\u4e86\u5982\u4f55\u521b\u5efa\u548c\u7ba1\u7406\u5206\u652f\u3002\u540c\u65f6\uff0c\u6211\u4eec\u8fd8\u4f1a\u8ba8\u8bba\u5982\u4f55\u5728git\u4e2d\u7ba1\u7406\u4e3b\u5206\u652f\u548c\u5176\u4ed6\u5206\u652f\u7684\u4e0d\u540c\u3002<\/p>\n<p>\u4ec0\u4e48\u662f\u5206\u652f<\/p>\n<p>\u5982\u679c\u4e0d\u719f\u6089Git\uff0c\u5206\u652f\u53ef\u80fd\u4f1a\u6709\u70b9\u4ee4\u4eba\u56f0\u60d1\u3002\u5728Git\u4e2d\uff0c\u201c\u5206\u652f\u201d\u53ef\u4ee5\u770b\u4f5c\u662f\u5f53\u524d\u4ee3\u7801\u5e93\u7684\u67d0\u4e2a\u7248\u672c\u7684\u526f\u672c\u3002\u5f53\u6211\u4eec\u5728\u5206\u652f\u4e2d\u8fdb\u884c\u4ee3\u7801\u66f4\u6539\u65f6\uff0c\u6211\u4eec\u4e0d\u4f1a\u5f71\u54cd\u5230\u4e3b\u5206\u652f(master)\uff0c\u4e5f\u4e0d\u4f1a\u5f71\u54cd\u5230\u5176\u4ed6\u5206\u652f\u3002\u901a\u8fc7\u8fd9\u79cd\u65b9\u5f0f\uff0c\u5206\u652f\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u7ec4\u7ec7\u5e76\u884c\u7684\u5f00\u53d1\u548c\u5b9e\u9a8c\uff0c\u540c\u65f6\u6211\u4eec\u53ef\u4ee5\u5c06\u672a\u7ecf\u5145\u5206\u6d4b\u8bd5\u7684\u4ee3\u7801\u5b58\u50a8\u5728\u5206\u652f\u4e2d\uff0c\u4ee5\u907f\u514d\u5bf9\u4e3b\u4ee3\u7801\u5e93\u9020\u6210\u4e0d\u826f\u5f71\u54cd\u3002<\/p>\n<p>\u5bf9\u4e8e\u6bcf\u4e2a\u65b0\u7684\u5206\u652f\u6765\u8bf4\uff0c\u90fd\u6709\u4e00\u4e2a\u57fa\u4e8e\u53e6\u4e00\u5206\u652f(\u6bd4\u5982\u4e3b\u5206\u652f)\u7684\u526f\u672c\uff0c\u5e76\u4e14\u4e0e\u539f\u59cb\u5206\u652f\u4e00\u6837\u5305\u542b\u8be5\u4ee3\u7801\u5e93\u7684\u5b8c\u6574\u526f\u672c\u3002 \u4e4b\u540e\uff0c\u4f60\u5c31\u53ef\u4ee5\u5728\u8be5\u5206\u652f\u4e0a\u5de5\u4f5c\uff0c\u8fdb\u884c\u4efb\u4f55\u4f60\u9700\u8981\u7684\u66f4\u6539\uff0c\u5e76\u5c06\u8fd9\u4e9b\u66f4\u6539\u52a0\u5165\u5230\u8be5\u5206\u652f\u7684\u5386\u53f2\u8bb0\u5f55\u4e2d\u3002<\/p>\n<p>\u5982\u4f55\u521b\u5efa\u5206\u652f<\/p>\n<p>\u8981\u521b\u5efa\u65b0\u7684\u5206\u652f\uff0c\u8bf7\u4f7f\u7528\u8be5\u201cgit branch\u201d\u547d\u4ee4\uff0c\u540e\u9762\u52a0\u4e0a\u65b0\u5206\u652f\u7684\u540d\u79f0\u3002\u6240\u4ee5\uff0c\u8981\u521b\u5efa\u4e00\u4e2a\u540d\u53eb\u201cnew-feature\u201d\u7684\u65b0\u5206\u652f\uff0c\u4f60\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n<pre>git branch new-feature<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8ba9\u6211\u4eec\u5c06\u8fd9\u4e2a\u547d\u4ee4\u8fdb\u884c\u89e3\u6790\u4e00\u4e0b\u3002\u9996\u5148\uff0c\u201cgit branch\u201d\u662f\u4e00\u79cd\u547d\u4ee4\uff0c\u5b83\u544a\u8bc9Git\u4f60\u60f3\u8981\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5206\u652f\u3002\u63a5\u4e0b\u6765\uff0c\u6211\u4eec\u6307\u5b9a\u65b0\u5206\u652f\u7684\u540d\u79f0\u2014\u2014\u201cnew-feature\u201d\u3002\u7136\u540e\uff0cGit\u4f1a\u5728\u5f53\u524d\u7684\u4ee3\u7801\u5e93\u4e2d\u521b\u5efa\u4e00\u4e2a\u540d\u4e3a\u201cnew-feature\u201d\u7684\u65b0\u5206\u652f\u3002<\/p>\n<p>\u4f46\u662f\uff0c\u901a\u8fc7\u4f7f\u7528\u8be5\u547d\u4ee4,Git\u5e76\u6ca1\u6709\u5c06\u4f60\u5207\u6362\u5230\u65b0\u5206\u652f\u4e2d\u5de5\u4f5c\u3002\u5982\u679c\u4f60\u60f3\u8981\u5c06\u5f53\u524d\u7684\u5de5\u4f5c\u73af\u5883\u5207\u6362\u5230\u65b0\u5206\u652f\u4e2d\uff0c\u8bf7\u4f7f\u7528Git\u7684\u201cgit checkout\u201d\u547d\u4ee4\uff0c\u540e\u9762\u52a0\u4e0a\u5206\u652f\u7684\u540d\u79f0\uff1a<\/p>\n<pre>git checkout new-feature<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8fd9\u4e2a\u547d\u4ee4\u544a\u8bc9Git\u5207\u6362\u5230\u540d\u4e3a\u201cnew-feature\u201d\u7684\u5206\u652f\u3002\u5728\u4f60\u6210\u529f\u5207\u6362\u5206\u652f\u540e\uff0c\u4f60\u53ef\u4ee5\u5728\u65b0\u5206\u652f\u4e2d\u6267\u884c\u4efb\u4f55\u66f4\u6539\u548c\u63d0\u4ea4\u3002\u8bf7\u6ce8\u610f\uff0c\u8be5\u6307\u4ee4\u201cgit branch\u201d\u4e5f\u53ef\u4ee5\u663e\u793a\u5f53\u524d\u6240\u6709\u7684\u5206\u652f\u3002<\/p>\n<pre>git branch<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u5982\u4f55\u7ba1\u7406\u5206\u652f<\/p>\n<p>\u73b0\u5728\u4f60\u5df2\u7ecf\u521b\u5efa\u4e86\u65b0\u5206\u652f\u5e76\u5207\u6362\u5230\u8be5\u5206\u652f\u4e2d\uff0c\u4f60\u53ef\u4ee5\u6267\u884c\u6240\u9700\u7684\u4ee3\u7801\u66f4\u6539\u548c\u63d0\u4ea4\u3002\u4e00\u65e6\u5206\u652f\u4e2d\u7684\u5de5\u4f5c\u5b8c\u6210\uff0c\u4f60\u53ef\u4ee5\u5c06\u5176\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e0a\uff0c\u6216\u8005\u5c06\u5176\u5220\u9664\u3002\u8fd9\u662f\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u5b8c\u6210\u7684\uff1a<\/p>\n<p>\u5408\u5e76\u5206\u652f:<\/p>\n<pre>git merge new-feature<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u5220\u9664\u5206\u652f:<\/p>\n<pre>git branch -d new-feature<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u8ba9\u6211\u4eec\u5c06\u8fd9\u4e24\u4e2a\u547d\u4ee4\u8fdb\u884c\u89e3\u6790\u4e00\u4e0b\u3002<\/p>\n<p>\u5bf9\u4e8e\u201cgit merge\u201d\u547d\u4ee4\uff0c\u8fd9\u4e2a\u547d\u4ee4\u544a\u8bc9Git\u5c06\u201cnew-feature\u201d\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e2d\u53bb\u3002\u56e0\u6b64\uff0c\u4e00\u65e6\u4f60\u5b8c\u6210\u4e86\u4f60\u5728\u201cnew-feature\u201d\u5206\u652f\u4e2d\u7684\u5de5\u4f5c\uff0c\u5e76\u4e14\u4f60\u60f3\u8981\u5c06\u4f60\u7684\u66f4\u6539\u5e94\u7528\u5230\u4ee3\u7801\u5e93\u7684\u5176\u4ed6\u5206\u652f\u4e2d\uff0c\u4f60\u53ea\u9700\u8981\u8fd0\u884c\u8be5\u547d\u4ee4\u4fbf\u53ef\u5b8c\u6210\u3002<\/p>\n<p>\u5bf9\u4e8e\u201cgit branch -d\u201d\u547d\u4ee4\uff0c\u8fd9\u4e2a\u547d\u4ee4\u544a\u8bc9Git\u5220\u9664\u8be5\u6307\u5b9a\u7684\u5206\u652f\uff08\u5728\u4e0a\u8ff0\u4f8b\u5b50\u4e2d\u4e3a\u201cnew-feature\u201d\uff09\u3002\u8bf7\u8c28\u614e\u4f7f\u7528\u6b64\u547d\u4ee4\uff0c\u56e0\u4e3a\u4e00\u65e6\u5220\u9664\u5206\u652f\uff0c\u4f60\u5c06\u6c38\u4e45\u4e22\u5931\u8be5\u5206\u652f\u4e2d\u7684\u66f4\u6539\u3002<\/p>\n<p>\u7ba1\u7406\u4e3b\u5206\u652f\u548c\u5176\u4ed6\u5206\u652f\u7684\u4e0d\u540c<\/p>\n<p>\u5728Git\u4e2d\uff0c\u4e3b\u5206\u652f\u901a\u5e38\u88ab\u79f0\u4e3a\u201cmaster\u201d\u3002\u8be5\u5206\u652f\u662f\u4ee3\u7801\u5e93\u7684\u9ed8\u8ba4\u5206\u652f\uff0c\u662f\u4ee3\u7801\u5e93\u7684\u4e2d\u5fc3\u67a2\u7ebd\u548c\u4e3b\u8981\u4ee3\u7801\u5e93\u63d0\u4ea4\u4ee3\u3002\u5728\u8f83\u5c0f\u7684\u9879\u76ee\u4e2d\uff0c\u6240\u6709\u5f00\u53d1\u8005\u90fd\u53ef\u80fd\u76f4\u63a5\u5de5\u4f5c\u5728\u4e3b\u5206\u652f\u4e0a\uff0c\u5e76\u5411\u8be5\u5206\u652f\u63d0\u4ea4\u4ee3\u7801\u66f4\u6539\u3002<\/p>\n<p>\u4f46\u662f\uff0c\u5728\u8f83\u5927\u548c\u66f4\u4e3a\u590d\u6742\u7684\u9879\u76ee\u4e2d\uff0c\u4f60\u53ef\u80fd\u9700\u8981\u591a\u4e2a\u5206\u652f\uff0c\u4ee5\u4fbf\u6765\u5904\u7406\u4e0d\u540c\u7684\u5f00\u53d1\u4efb\u52a1\u6216\u8005\u8fd9\u4e9b\u5206\u652f\u4f1a\u4e0e\u67d0\u4e9b\u529f\u80fd\u6216\u7248\u672c\u76f8\u5173\u8054\u3002\u5bf9\u4e8e\u8fd9\u4e9b\u9879\u76ee\uff0c\u4e3b\u5206\u652f\u53ef\u80fd\u53ea\u662f\u4e00\u4e2a\u5206\u652f\u4e2d\u7684\u6240\u6709\u5206\u652f\u7684\u4e00\u4e2a\uff0c\u6839\u636e\u5177\u4f53\u60c5\u51b5\u53ef\u80fd\u4f1a\u6709\u66f4\u591a\u7684\u4e3b\u5206\u652f\u7248\u672c\u3002\u6b64\u5916\uff0c\u4e0d\u540c\u7684\u5206\u652f\u6709\u4e0d\u540c\u7684\u547d\u540d\u7ea6\u5b9a\uff0c\u4f8b\u5982\u201cdevelop\u201d\u3001\u201cfeature\u201d\u3001\u201crelease\u201d\u6216\u201chotfix\u201d\u7b49\uff0c\u4ee5\u4fbf\u5f00\u53d1\u8005\u66f4\u5bb9\u6613\u5730\u8bc6\u522b\u51fa\u5b83\u4eec\u7684\u610f\u56fe\u3002<\/p>\n<p>\u603b\u7ed3<\/p>\n<p>Git\u5206\u652f\u662fGit\u4e2d\u4e00\u4e2a\u975e\u5e38\u91cd\u8981\u7684\u6982\u5ff5\u3002\u901a\u8fc7\u4f7f\u7528\u5206\u652f\uff0c\u6211\u4eec\u53ef\u4ee5\u5e76\u884c\u5f00\u5c55\u591a\u4e2a\u5f00\u53d1\u4efb\u52a1\uff0c\u907f\u514d\u5bf9\u4e3b\u4ee3\u7801\u5e93\u4ea7\u751f\u5f71\u54cd\u3002\u5f53\u4f60\u521b\u5efa\u65b0\u5206\u652f\u65f6\uff0c\u8bf7\u786e\u4fdd\u4ed4\u7ec6\u8003\u8651\u4f60\u8981\u6267\u884c\u7684\u66f4\u6539\uff0c\u4ee5\u53ca\u4f60\u7f16\u8f91\u7684\u53d8\u66f4\u662f\u5426\u9700\u8981\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e2d\u3002\u56e0\u6b64\uff0c\u5728\u4f7f\u7528Git\u8fdb\u884c\u9879\u76ee\u5f00\u53d1\u65f6\uff0c\u66f4\u597d\u7684\u7406\u89e3\u5206\u652f\u7684\u4f7f\u7528\u5c06\u5bf9\u4e8e\u7f16\u5199\u4ee3\u7801\u4ee5\u53ca\u907f\u514d\u53ef\u907f\u514d\u7684\u9519\u8bef\u975e\u5e38\u91cd\u8981\u3002<\/p>\n<p>\u4ee5\u4e0a\u5c31\u662fgit\u600e\u4e48\u662f\u4e0d\u662f\u4e3b\u5206\u652f\u7684\u8be6\u7ec6\u5185\u5bb9\uff0c\u66f4\u591a\u8bf7\u5173\u6ce8\u7c73\u4e91\u5176\u5b83\u76f8\u5173\u6587\u7ae0\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u5728\u9879\u76ee\u5f00\u53d1\u4e2d\uff0cgit\u662f\u975e\u5e38\u5e38\u7528\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\u3002 \u5728git\u4e2d\uff0c\u5206\u652f(branch)\u662f\u4e00\u4e2a\u81f3\u5173\u91cd\u8981\u7684\u6982\u5ff5\u3002\u5b83\u5141\u8bb8\u5728\u540c\u4e00\u4ee3\u7801\u5e93\u4e2d\u8fdb\u884c\u591a\u4e2a\u5e76\u884c\u5f00\u53d1\uff0c\u5e76\u4e14\u53ef\u4ee5\u907f\u514d\u5f00\u53d1\u8fc7\u7a0b\u4e2d\u7684\u51b2\u7a81\u548c\u9519\u8bef\u3002\u5728\u8fd9\u7bc7\u6587\u7ae0\u4e2d\uff0c\u6211\u4eec\u5c06\u5b66\u4e60\u5982\u4f55\u5728git\u4e2d\u4f7f\u7528\u5206\u652f\uff0c\u5e76\u4e14\u89e3\u91ca\u4e86\u5982\u4f55\u521b\u5efa\u548c\u7ba1\u7406\u5206\u652f\u3002\u540c\u65f6\uff0c\u6211\u4eec\u8fd8\u4f1a\u8ba8\u8bba\u5982\u4f55\u5728git\u4e2d\u7ba1\u7406\u4e3b\u5206\u652f\u548c\u5176\u4ed6\u5206\u652f\u7684\u4e0d\u540c\u3002 \u4ec0\u4e48\u662f\u5206\u652f \u5982\u679c\u4e0d\u719f\u6089Git\uff0c\u5206\u652f\u53ef\u80fd\u4f1a\u6709\u70b9\u4ee4\u4eba\u56f0\u60d1\u3002\u5728Git\u4e2d\uff0c\u201c\u5206\u652f\u201d\u53ef\u4ee5\u770b\u4f5c\u662f\u5f53\u524d\u4ee3\u7801\u5e93\u7684\u67d0\u4e2a\u7248\u672c\u7684\u526f\u672c\u3002\u5f53\u6211\u4eec\u5728\u5206\u652f\u4e2d\u8fdb\u884c\u4ee3\u7801\u66f4\u6539\u65f6\uff0c\u6211\u4eec\u4e0d\u4f1a\u5f71\u54cd\u5230\u4e3b\u5206\u652f(master)\uff0c\u4e5f\u4e0d\u4f1a\u5f71\u54cd\u5230\u5176\u4ed6\u5206\u652f\u3002\u901a\u8fc7\u8fd9\u79cd\u65b9\u5f0f\uff0c\u5206\u652f\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u7ec4\u7ec7\u5e76\u884c\u7684\u5f00\u53d1\u548c\u5b9e\u9a8c\uff0c\u540c\u65f6\u6211\u4eec\u53ef\u4ee5\u5c06\u672a\u7ecf\u5145\u5206\u6d4b\u8bd5\u7684\u4ee3\u7801\u5b58\u50a8\u5728\u5206\u652f\u4e2d\uff0c\u4ee5\u907f\u514d\u5bf9\u4e3b\u4ee3\u7801\u5e93\u9020\u6210\u4e0d\u826f\u5f71\u54cd\u3002 \u5bf9\u4e8e\u6bcf\u4e2a\u65b0\u7684\u5206\u652f\u6765\u8bf4\uff0c\u90fd\u6709\u4e00\u4e2a\u57fa\u4e8e\u53e6\u4e00\u5206\u652f(\u6bd4\u5982\u4e3b\u5206\u652f)\u7684\u526f\u672c\uff0c\u5e76\u4e14\u4e0e\u539f\u59cb\u5206\u652f\u4e00\u6837\u5305\u542b\u8be5\u4ee3\u7801\u5e93\u7684\u5b8c\u6574\u526f\u672c\u3002 \u4e4b\u540e\uff0c\u4f60\u5c31\u53ef\u4ee5\u5728\u8be5\u5206\u652f\u4e0a\u5de5\u4f5c\uff0c\u8fdb\u884c\u4efb\u4f55\u4f60\u9700\u8981\u7684\u66f4\u6539\uff0c\u5e76\u5c06\u8fd9\u4e9b\u66f4\u6539\u52a0\u5165\u5230\u8be5\u5206\u652f\u7684\u5386\u53f2\u8bb0\u5f55\u4e2d\u3002 \u5982\u4f55\u521b\u5efa\u5206\u652f \u8981\u521b\u5efa\u65b0\u7684\u5206\u652f\uff0c\u8bf7\u4f7f\u7528\u8be5\u201cgit branch\u201d\u547d\u4ee4\uff0c\u540e\u9762\u52a0\u4e0a\u65b0\u5206\u652f\u7684\u540d\u79f0\u3002\u6240\u4ee5\uff0c\u8981\u521b\u5efa\u4e00\u4e2a\u540d\u53eb\u201cnew-feature\u201d\u7684\u65b0\u5206\u652f\uff0c\u4f60\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a git branch new-feature \u767b\u5f55\u540e\u590d\u5236 \u8ba9\u6211\u4eec\u5c06\u8fd9\u4e2a\u547d\u4ee4\u8fdb\u884c\u89e3\u6790\u4e00\u4e0b\u3002\u9996\u5148\uff0c\u201cgit branch\u201d\u662f\u4e00\u79cd\u547d\u4ee4\uff0c\u5b83\u544a\u8bc9Git\u4f60\u60f3\u8981\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5206\u652f\u3002\u63a5\u4e0b\u6765\uff0c\u6211\u4eec\u6307\u5b9a\u65b0\u5206\u652f\u7684\u540d\u79f0\u2014\u2014\u201cnew-feature\u201d\u3002\u7136\u540e\uff0cGit\u4f1a\u5728\u5f53\u524d\u7684\u4ee3\u7801\u5e93\u4e2d\u521b\u5efa\u4e00\u4e2a\u540d\u4e3a\u201cnew-feature\u201d\u7684\u65b0\u5206\u652f\u3002 \u4f46\u662f\uff0c\u901a\u8fc7\u4f7f\u7528\u8be5\u547d\u4ee4,Git\u5e76\u6ca1\u6709\u5c06\u4f60\u5207\u6362\u5230\u65b0\u5206\u652f\u4e2d\u5de5\u4f5c\u3002\u5982\u679c\u4f60\u60f3\u8981\u5c06\u5f53\u524d\u7684\u5de5\u4f5c\u73af\u5883\u5207\u6362\u5230\u65b0\u5206\u652f\u4e2d\uff0c\u8bf7\u4f7f\u7528Git\u7684\u201cgit checkout\u201d\u547d\u4ee4\uff0c\u540e\u9762\u52a0\u4e0a\u5206\u652f\u7684\u540d\u79f0\uff1a git checkout new-feature \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u4e2a\u547d\u4ee4\u544a\u8bc9Git\u5207\u6362\u5230\u540d\u4e3a\u201cnew-feature\u201d\u7684\u5206\u652f\u3002\u5728\u4f60\u6210\u529f\u5207\u6362\u5206\u652f\u540e\uff0c\u4f60\u53ef\u4ee5\u5728\u65b0\u5206\u652f\u4e2d\u6267\u884c\u4efb\u4f55\u66f4\u6539\u548c\u63d0\u4ea4\u3002\u8bf7\u6ce8\u610f\uff0c\u8be5\u6307\u4ee4\u201cgit branch\u201d\u4e5f\u53ef\u4ee5\u663e\u793a\u5f53\u524d\u6240\u6709\u7684\u5206\u652f\u3002 git branch \u767b\u5f55\u540e\u590d\u5236 \u5982\u4f55\u7ba1\u7406\u5206\u652f \u73b0\u5728\u4f60\u5df2\u7ecf\u521b\u5efa\u4e86\u65b0\u5206\u652f\u5e76\u5207\u6362\u5230\u8be5\u5206\u652f\u4e2d\uff0c\u4f60\u53ef\u4ee5\u6267\u884c\u6240\u9700\u7684\u4ee3\u7801\u66f4\u6539\u548c\u63d0\u4ea4\u3002\u4e00\u65e6\u5206\u652f\u4e2d\u7684\u5de5\u4f5c\u5b8c\u6210\uff0c\u4f60\u53ef\u4ee5\u5c06\u5176\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e0a\uff0c\u6216\u8005\u5c06\u5176\u5220\u9664\u3002\u8fd9\u662f\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u5b8c\u6210\u7684\uff1a \u5408\u5e76\u5206\u652f: git merge new-feature \u767b\u5f55\u540e\u590d\u5236 \u5220\u9664\u5206\u652f: git branch -d new-feature \u767b\u5f55\u540e\u590d\u5236 \u8ba9\u6211\u4eec\u5c06\u8fd9\u4e24\u4e2a\u547d\u4ee4\u8fdb\u884c\u89e3\u6790\u4e00\u4e0b\u3002 \u5bf9\u4e8e\u201cgit merge\u201d\u547d\u4ee4\uff0c\u8fd9\u4e2a\u547d\u4ee4\u544a\u8bc9Git\u5c06\u201cnew-feature\u201d\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e2d\u53bb\u3002\u56e0\u6b64\uff0c\u4e00\u65e6\u4f60\u5b8c\u6210\u4e86\u4f60\u5728\u201cnew-feature\u201d\u5206\u652f\u4e2d\u7684\u5de5\u4f5c\uff0c\u5e76\u4e14\u4f60\u60f3\u8981\u5c06\u4f60\u7684\u66f4\u6539\u5e94\u7528\u5230\u4ee3\u7801\u5e93\u7684\u5176\u4ed6\u5206\u652f\u4e2d\uff0c\u4f60\u53ea\u9700\u8981\u8fd0\u884c\u8be5\u547d\u4ee4\u4fbf\u53ef\u5b8c\u6210\u3002 \u5bf9\u4e8e\u201cgit branch -d\u201d\u547d\u4ee4\uff0c\u8fd9\u4e2a\u547d\u4ee4\u544a\u8bc9Git\u5220\u9664\u8be5\u6307\u5b9a\u7684\u5206\u652f\uff08\u5728\u4e0a\u8ff0\u4f8b\u5b50\u4e2d\u4e3a\u201cnew-feature\u201d\uff09\u3002\u8bf7\u8c28\u614e\u4f7f\u7528\u6b64\u547d\u4ee4\uff0c\u56e0\u4e3a\u4e00\u65e6\u5220\u9664\u5206\u652f\uff0c\u4f60\u5c06\u6c38\u4e45\u4e22\u5931\u8be5\u5206\u652f\u4e2d\u7684\u66f4\u6539\u3002 \u7ba1\u7406\u4e3b\u5206\u652f\u548c\u5176\u4ed6\u5206\u652f\u7684\u4e0d\u540c \u5728Git\u4e2d\uff0c\u4e3b\u5206\u652f\u901a\u5e38\u88ab\u79f0\u4e3a\u201cmaster\u201d\u3002\u8be5\u5206\u652f\u662f\u4ee3\u7801\u5e93\u7684\u9ed8\u8ba4\u5206\u652f\uff0c\u662f\u4ee3\u7801\u5e93\u7684\u4e2d\u5fc3\u67a2\u7ebd\u548c\u4e3b\u8981\u4ee3\u7801\u5e93\u63d0\u4ea4\u4ee3\u3002\u5728\u8f83\u5c0f\u7684\u9879\u76ee\u4e2d\uff0c\u6240\u6709\u5f00\u53d1\u8005\u90fd\u53ef\u80fd\u76f4\u63a5\u5de5\u4f5c\u5728\u4e3b\u5206\u652f\u4e0a\uff0c\u5e76\u5411\u8be5\u5206\u652f\u63d0\u4ea4\u4ee3\u7801\u66f4\u6539\u3002 \u4f46\u662f\uff0c\u5728\u8f83\u5927\u548c\u66f4\u4e3a\u590d\u6742\u7684\u9879\u76ee\u4e2d\uff0c\u4f60\u53ef\u80fd\u9700\u8981\u591a\u4e2a\u5206\u652f\uff0c\u4ee5\u4fbf\u6765\u5904\u7406\u4e0d\u540c\u7684\u5f00\u53d1\u4efb\u52a1\u6216\u8005\u8fd9\u4e9b\u5206\u652f\u4f1a\u4e0e\u67d0\u4e9b\u529f\u80fd\u6216\u7248\u672c\u76f8\u5173\u8054\u3002\u5bf9\u4e8e\u8fd9\u4e9b\u9879\u76ee\uff0c\u4e3b\u5206\u652f\u53ef\u80fd\u53ea\u662f\u4e00\u4e2a\u5206\u652f\u4e2d\u7684\u6240\u6709\u5206\u652f\u7684\u4e00\u4e2a\uff0c\u6839\u636e\u5177\u4f53\u60c5\u51b5\u53ef\u80fd\u4f1a\u6709\u66f4\u591a\u7684\u4e3b\u5206\u652f\u7248\u672c\u3002\u6b64\u5916\uff0c\u4e0d\u540c\u7684\u5206\u652f\u6709\u4e0d\u540c\u7684\u547d\u540d\u7ea6\u5b9a\uff0c\u4f8b\u5982\u201cdevelop\u201d\u3001\u201cfeature\u201d\u3001\u201crelease\u201d\u6216\u201chotfix\u201d\u7b49\uff0c\u4ee5\u4fbf\u5f00\u53d1\u8005\u66f4\u5bb9\u6613\u5730\u8bc6\u522b\u51fa\u5b83\u4eec\u7684\u610f\u56fe\u3002 \u603b\u7ed3 Git\u5206\u652f\u662fGit\u4e2d\u4e00\u4e2a\u975e\u5e38\u91cd\u8981\u7684\u6982\u5ff5\u3002\u901a\u8fc7\u4f7f\u7528\u5206\u652f\uff0c\u6211\u4eec\u53ef\u4ee5\u5e76\u884c\u5f00\u5c55\u591a\u4e2a\u5f00\u53d1\u4efb\u52a1\uff0c\u907f\u514d\u5bf9\u4e3b\u4ee3\u7801\u5e93\u4ea7\u751f\u5f71\u54cd\u3002\u5f53\u4f60\u521b\u5efa\u65b0\u5206\u652f\u65f6\uff0c\u8bf7\u786e\u4fdd\u4ed4\u7ec6\u8003\u8651\u4f60\u8981\u6267\u884c\u7684\u66f4\u6539\uff0c\u4ee5\u53ca\u4f60\u7f16\u8f91\u7684\u53d8\u66f4\u662f\u5426\u9700\u8981\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e2d\u3002\u56e0\u6b64\uff0c\u5728\u4f7f\u7528Git\u8fdb\u884c\u9879\u76ee\u5f00\u53d1\u65f6\uff0c\u66f4\u597d\u7684\u7406\u89e3\u5206\u652f\u7684\u4f7f\u7528\u5c06\u5bf9\u4e8e\u7f16\u5199\u4ee3\u7801\u4ee5\u53ca\u907f\u514d\u53ef\u907f\u514d\u7684\u9519\u8bef\u975e\u5e38\u91cd\u8981\u3002 \u4ee5\u4e0a\u5c31\u662fgit\u600e\u4e48\u662f\u4e0d\u662f\u4e3b\u5206\u652f\u7684\u8be6\u7ec6\u5185\u5bb9\uff0c\u66f4\u591a\u8bf7\u5173\u6ce8\u7c73\u4e91\u5176\u5b83\u76f8\u5173\u6587\u7ae0\uff01<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[16],"tags":[],"class_list":["post-20136","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20136","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/comments?post=20136"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20136\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20136"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20136"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20136"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}