1.1 Git \u5206\u652f - \u5206\u652f\u7b80\u4ecb<\/strong><\/div>\n
\u6709\u4eba\u628a Git \u7684\u5206\u652f\u6a21\u578b\u79f0\u4e3a\u5b83\u7684\u201c\u5fc5\u6740\u6280\u7279\u6027\u201d\uff0c\u4e5f\u6b63\u56e0\u4e3a\u8fd9\u4e00\u7279\u6027\uff0c\u4f7f\u5f97 Git \u4ece\u4f17\u591a\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u4e2d\u8131\u9896\u800c\u51fa\u3002 \u4e3a\u4f55 Git \u7684\u5206\u652f\u6a21\u578b\u5982\u6b64\u51fa\u4f17\u5462\uff1f Git \u5904\u7406\u5206\u652f\u7684\u65b9\u5f0f\u53ef\u8c13\u662f\u96be\u4ee5\u7f6e\u4fe1\u7684\u8f7b\u91cf\uff0c\u521b\u5efa\u65b0\u5206\u652f\u8fd9\u4e00\u64cd\u4f5c\u51e0\u4e4e\u80fd\u5728\u77ac\u95f4\u5b8c\u6210\uff0c\u5e76\u4e14\u5728\u4e0d\u540c\u5206\u652f\u4e4b\u95f4\u7684\u5207\u6362\u64cd\u4f5c\u4e5f\u662f\u4e00\u6837\u4fbf\u6377\u3002 \u4e0e\u8bb8\u591a\u5176\u5b83\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u4e0d\u540c\uff0cGit \u9f13\u52b1\u5728\u5de5\u4f5c\u6d41\u7a0b\u4e2d\u9891\u7e41\u5730\u4f7f\u7528\u5206\u652f\u4e0e\u5408\u5e76\uff0c\u54ea\u6015\u4e00\u5929\u4e4b\u5185\u8fdb\u884c\u8bb8\u591a\u6b21\u3002 \u7406\u89e3\u548c\u7cbe\u901a\u8fd9\u4e00\u7279\u6027\uff0c\u4f60\u4fbf\u4f1a\u610f\u8bc6\u5230 Git \u662f\u5982\u6b64\u7684\u5f3a\u5927\u800c\u53c8\u72ec\u7279\uff0c\u5e76\u4e14\u4ece\u6b64\u771f\u6b63\u6539\u53d8\u4f60\u7684\u5f00\u53d1\u65b9\u5f0f\u3002<\/p>\n
\u5206\u652f\u7b80\u4ecb<\/strong><\/span><\/div>\n
\u4e3a\u4e86\u771f\u6b63\u7406\u89e3 Git \u5904\u7406\u5206\u652f\u7684\u65b9\u5f0f\uff0c\u6211\u4eec\u9700\u8981\u56de\u987e\u4e00\u4e0b Git \u662f\u5982\u4f55\u4fdd\u5b58\u6570\u636e\u7684\u3002<\/p>\n
\u6216\u8bb8\u4f60\u8fd8\u8bb0\u5f97\u00a0\u8d77\u6b65<\/a>\u00a0\u7684\u5185\u5bb9\uff0cGit \u4fdd\u5b58\u7684\u4e0d\u662f\u6587\u4ef6\u7684\u53d8\u5316\u6216\u8005\u5dee\u5f02\uff0c\u800c\u662f\u4e00\u7cfb\u5217\u4e0d\u540c\u65f6\u523b\u7684\u6587\u4ef6\u5feb\u7167\u3002<\/p>\n
\u5728\u8fdb\u884c\u63d0\u4ea4\u64cd\u4f5c\u65f6\uff0cGit \u4f1a\u4fdd\u5b58\u4e00\u4e2a\u63d0\u4ea4\u5bf9\u8c61\uff08commit object\uff09\u3002\u77e5\u9053\u4e86 Git \u4fdd\u5b58\u6570\u636e\u7684\u65b9\u5f0f\uff0c\u6211\u4eec\u53ef\u4ee5\u5f88\u81ea\u7136\u7684\u60f3\u5230\u2014\u2014\u8be5\u63d0\u4ea4\u5bf9\u8c61\u4f1a\u5305\u542b\u4e00\u4e2a\u6307\u5411\u6682\u5b58\u5185\u5bb9\u5feb\u7167\u7684\u6307\u9488\u3002 \u4f46\u4e0d\u4ec5\u4ec5\u662f\u8fd9\u6837\uff0c\u8be5\u63d0\u4ea4\u5bf9\u8c61\u8fd8\u5305\u542b\u4e86\u4f5c\u8005\u7684\u59d3\u540d\u548c\u90ae\u7bb1\u3001\u63d0\u4ea4\u65f6\u8f93\u5165\u7684\u4fe1\u606f\u4ee5\u53ca\u6307\u5411\u5b83\u7684\u7236\u5bf9\u8c61\u7684\u6307\u9488\u3002\u9996\u6b21\u63d0\u4ea4\u4ea7\u751f\u7684\u63d0\u4ea4\u5bf9\u8c61\u6ca1\u6709\u7236\u5bf9\u8c61\uff0c\u666e\u901a\u63d0\u4ea4\u64cd\u4f5c\u4ea7\u751f\u7684\u63d0\u4ea4\u5bf9\u8c61\u6709\u4e00\u4e2a\u7236\u5bf9\u8c61\uff0c\u800c\u7531\u591a\u4e2a\u5206\u652f\u5408\u5e76\u4ea7\u751f\u7684\u63d0\u4ea4\u5bf9\u8c61\u6709\u591a\u4e2a\u7236\u5bf9\u8c61\uff0c<\/p>\n
\u4e3a\u4e86\u8bf4\u5f97\u66f4\u52a0\u5f62\u8c61\uff0c\u6211\u4eec\u5047\u8bbe\u73b0\u5728\u6709\u4e00\u4e2a\u5de5\u4f5c\u76ee\u5f55\uff0c\u91cc\u9762\u5305\u542b\u4e86\u4e09\u4e2a\u5c06\u8981\u88ab\u6682\u5b58\u548c\u63d0\u4ea4\u7684\u6587\u4ef6\u3002 \u6682\u5b58\u64cd\u4f5c\u4f1a\u4e3a\u6bcf\u4e00\u4e2a\u6587\u4ef6\u8ba1\u7b97\u6821\u9a8c\u548c\uff08\u4f7f\u7528\u6211\u4eec\u5728\u00a0 \u8d77\u6b65<\/a>\u00a0\u4e2d\u63d0\u5230\u7684 SHA-1 \u54c8\u5e0c\u7b97\u6cd5\uff09\uff0c\u7136\u540e\u4f1a\u628a\u5f53\u524d\u7248\u672c\u7684\u6587\u4ef6\u5feb\u7167\u4fdd\u5b58\u5230 Git \u4ed3\u5e93\u4e2d\uff08Git \u4f7f\u7528 blob \u5bf9\u8c61\u6765\u4fdd\u5b58\u5b83\u4eec\uff09\uff0c\u6700\u7ec8\u5c06\u6821\u9a8c\u548c\u52a0\u5165\u5230\u6682\u5b58\u533a\u57df\u7b49\u5f85\u63d0\u4ea4\uff1a<\/p>\n
$ git add README test.rb LICENSE\r\n$ git commit -m 'The initial commit of my project'<\/pre>\n
\u5f53\u4f7f\u7528\u00a0git commit\u00a0\u8fdb\u884c\u63d0\u4ea4\u64cd\u4f5c\u65f6\uff0cGit \u4f1a\u5148\u8ba1\u7b97\u6bcf\u4e00\u4e2a\u5b50\u76ee\u5f55\uff08\u672c\u4f8b\u4e2d\u53ea\u6709\u9879\u76ee\u6839\u76ee\u5f55\uff09\u7684\u6821\u9a8c\u548c\uff0c\u7136\u540e\u5728 Git \u4ed3\u5e93\u4e2d\u8fd9\u4e9b\u6821\u9a8c\u548c\u4fdd\u5b58\u4e3a\u6811\u5bf9\u8c61\u3002 \u968f\u540e\uff0cGit \u4fbf\u4f1a\u521b\u5efa\u4e00\u4e2a\u63d0\u4ea4\u5bf9\u8c61\uff0c\u5b83\u9664\u4e86\u5305\u542b\u4e0a\u9762\u63d0\u5230\u7684\u90a3\u4e9b\u4fe1\u606f\u5916\uff0c\u8fd8\u5305\u542b\u6307\u5411\u8fd9\u4e2a\u6811\u5bf9\u8c61\uff08\u9879\u76ee\u6839\u76ee\u5f55\uff09\u7684\u6307\u9488\u3002\u5982\u6b64\u4e00\u6765\uff0cGit \u5c31\u53ef\u4ee5\u5728\u9700\u8981\u7684\u65f6\u5019\u91cd\u73b0\u6b64\u6b21\u4fdd\u5b58\u7684\u5feb\u7167\u3002 <\/a><\/p>\n
\u73b0\u5728\uff0cGit \u4ed3\u5e93\u4e2d\u6709\u4e94\u4e2a\u5bf9\u8c61\uff1a\u4e09\u4e2a blob \u5bf9\u8c61\uff08\u4fdd\u5b58\u7740\u6587\u4ef6\u5feb\u7167\uff09\u3001\u4e00\u4e2a\u6811\u5bf9\u8c61\uff08\u8bb0\u5f55\u7740\u76ee\u5f55\u7ed3\u6784\u548c blob \u5bf9\u8c61\u7d22\u5f15\uff09\u4ee5\u53ca\u4e00\u4e2a\u63d0\u4ea4\u5bf9\u8c61\uff08\u5305\u542b\u7740\u6307\u5411\u524d\u8ff0\u6811\u5bf9\u8c61\u7684\u6307\u9488\u548c\u6240\u6709\u63d0\u4ea4\u4fe1\u606f\uff09\u3002<\/p>\n
$\"\u9996\u6b21\u63d0\u4ea4\u5bf9\u8c61\u53ca\u5176\u6811\u7ed3\u6784.\"$ <\/p>\n
Figure 3-1.\u00a0\u9996\u6b21\u63d0\u4ea4\u5bf9\u8c61\u53ca\u5176\u6811\u7ed3\u6784\u505a\u4e9b\u4fee\u6539\u540e\u518d\u6b21\u63d0\u4ea4\uff0c\u90a3\u4e48\u8fd9\u6b21\u4ea7\u751f\u7684\u63d0\u4ea4\u5bf9\u8c61\u4f1a\u5305\u542b\u4e00\u4e2a\u6307\u5411\u4e0a\u6b21\u63d0\u4ea4\u5bf9\u8c61\uff08\u7236\u5bf9\u8c61\uff09\u7684\u6307\u9488\u3002<\/p>\n
$\"\u63d0\u4ea4\u5bf9\u8c61\u53ca\u5176\u7236\u5bf9\u8c61.\"$ <\/p>\n
Figure 3-2.\u00a0\u63d0\u4ea4\u5bf9\u8c61\u53ca\u5176\u7236\u5bf9\u8c61Git \u7684\u5206\u652f\uff0c\u5176\u5b9e\u672c\u8d28\u4e0a\u4ec5\u4ec5\u662f\u6307\u5411\u63d0\u4ea4\u5bf9\u8c61\u7684\u53ef\u53d8\u6307\u9488\u3002 Git \u7684\u9ed8\u8ba4\u5206\u652f\u540d\u5b57\u662f\u00a0master\u3002 \u5728\u591a\u6b21\u63d0\u4ea4\u64cd\u4f5c\u4e4b\u540e\uff0c\u4f60\u5176\u5b9e\u5df2\u7ecf\u6709\u4e00\u4e2a\u6307\u5411\u6700\u540e\u90a3\u4e2a\u63d0\u4ea4\u5bf9\u8c61\u7684\u00a0master\u00a0\u5206\u652f\u3002 \u5b83\u4f1a\u5728\u6bcf\u6b21\u7684\u63d0\u4ea4\u64cd\u4f5c\u4e2d\u81ea\u52a8\u5411\u524d\u79fb\u52a8\u3002<\/p>\n
NOTE<\/strong><\/span><\/div>\nGit \u7684 \u201cmaster\u201d \u5206\u652f\u5e76\u4e0d\u662f\u4e00\u4e2a\u7279\u6b8a\u5206\u652f\u3002 <\/a>\u00a0\u5b83\u5c31\u8ddf\u5176\u5b83\u5206\u652f\u5b8c\u5168\u6ca1\u6709\u533a\u522b\u3002 \u4e4b\u6240\u4ee5\u51e0\u4e4e\u6bcf\u4e00\u4e2a\u4ed3\u5e93\u90fd\u6709 master \u5206\u652f\uff0c\u662f\u56e0\u4e3a\u00a0git init\u00a0\u547d\u4ee4\u9ed8\u8ba4\u521b\u5efa\u5b83\uff0c\u5e76\u4e14\u5927\u591a\u6570\u4eba\u90fd\u61d2\u5f97\u53bb\u6539\u52a8\u5b83\u3002<\/p>\n
$\"\u5206\u652f\u53ca\u5176\u63d0\u4ea4\u5386\u53f2.\"$ <\/p>\n
Figure 3-3.\u00a0\u5206\u652f\u53ca\u5176\u63d0\u4ea4\u5386\u53f2<\/p>\n
\u5206\u652f\u521b\u5efa<\/strong><\/span><\/div>\n<\/a>Git \u662f\u600e\u4e48\u521b\u5efa\u65b0\u5206\u652f\u7684\u5462\uff1f \u5f88\u7b80\u5355\uff0c\u5b83\u53ea\u662f\u4e3a\u4f60\u521b\u5efa\u4e86\u4e00\u4e2a\u53ef\u4ee5\u79fb\u52a8\u7684\u65b0\u7684\u6307\u9488\u3002 \u6bd4\u5982\uff0c\u521b\u5efa\u4e00\u4e2a testing \u5206\u652f\uff0c \u4f60\u9700\u8981\u4f7f\u7528\u00a0git branch\u00a0\u547d\u4ee4\uff1a <\/a><\/p>\n
git branch testing<\/pre>\n
\u8fd9\u4f1a\u5728\u5f53\u524d\u6240\u5728\u7684\u63d0\u4ea4\u5bf9\u8c61\u4e0a\u521b\u5efa\u4e00\u4e2a\u6307\u9488\u3002<\/p>\n
$\"\u4e24\u4e2a\u6307\u5411\u76f8\u540c\u63d0\u4ea4\u5386\u53f2\u7684\u5206\u652f\u3002\"$ <\/p>\n
Figure 3-4.\u00a0\u4e24\u4e2a\u6307\u5411\u76f8\u540c\u63d0\u4ea4\u5386\u53f2\u7684\u5206\u652f\u90a3\u4e48\uff0cGit \u53c8\u662f\u600e\u4e48\u77e5\u9053\u5f53\u524d\u5728\u54ea\u4e00\u4e2a\u5206\u652f\u4e0a\u5462\uff1f \u4e5f\u5f88\u7b80\u5355\uff0c\u5b83\u6709\u4e00\u4e2a\u540d\u4e3a\u00a0HEAD\u00a0\u7684\u7279\u6b8a\u6307\u9488\u3002 \u8bf7\u6ce8\u610f\u5b83\u548c\u8bb8\u591a\u5176\u5b83\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff08\u5982 Subversion \u6216 CVS\uff09\u91cc\u7684HEAD\u6982\u5ff5\u5b8c\u5168\u4e0d\u540c\u3002 \u5728 Git \u4e2d\uff0c\u5b83\u662f\u4e00\u4e2a\u6307\u9488\uff0c\u6307\u5411\u5f53\u524d\u6240\u5728\u7684\u672c\u5730\u5206\u652f\uff08\u8bd1\u6ce8\uff1a\u5c06\u00a0HEAD\u00a0\u60f3\u8c61\u4e3a\u5f53\u524d\u5206\u652f\u7684\u522b\u540d\uff09\u3002 \u5728\u672c\u4f8b\u4e2d\uff0c\u4f60\u4ecd\u7136\u5728master\u00a0\u5206\u652f\u4e0a\u3002 \u56e0\u4e3a\u00a0git branch\u00a0\u547d\u4ee4\u4ec5\u4ec5\u00a0\u521b\u5efa<\/em>\u00a0\u4e00\u4e2a\u65b0\u5206\u652f\uff0c\u5e76\u4e0d\u4f1a\u81ea\u52a8\u5207\u6362\u5230\u65b0\u5206\u652f\u4e2d\u53bb\u3002<\/p>\n
$\"HEAD$ <\/p>\n
Figure 3-5.\u00a0HEAD \u6307\u5411\u5f53\u524d\u6240\u5728\u7684\u5206\u652f\u4f60\u53ef\u4ee5\u7b80\u5355\u5730\u4f7f\u7528git log\u00a0\u547d\u4ee4\u67e5\u770b\u5404\u4e2a\u5206\u652f\u5f53\u524d\u6240\u6307\u7684\u5bf9\u8c61\u3002 \u63d0\u4f9b\u8fd9\u4e00\u529f\u80fd\u7684\u53c2\u6570\u662f\u00a0--decorate\u3002<\/p>\n
git log --oneline --decorate\r\nf30ab (HEAD, master, testing) add feature #32 - ability to add new\r\n34ac2 fixed bug #1328 - stack overflow under certain conditions\r\n98ca9 initial commit of my project<\/pre>\n
\u6b63\u5982\u4f60\u6240\u89c1\uff0c\u5f53\u524d \u201cmaster\u201d \u548c \u201ctesting\u201d \u5206\u652f\u5747\u6307\u5411\u6821\u9a8c\u548c\u4ee5\u00a0f30ab\u00a0\u5f00\u5934\u7684\u63d0\u4ea4\u5bf9\u8c61\u3002<\/p>\n
\u5206\u652f\u5207\u6362<\/strong><\/span><\/div>\n<\/a>\u8981\u5207\u6362\u5230\u4e00\u4e2a\u5df2\u5b58\u5728\u7684\u5206\u652f\uff0c\u4f60\u9700\u8981\u4f7f\u7528\u00a0git checkout\u00a0\u547d\u4ee4\u3002 <\/a>\u00a0\u6211\u4eec\u73b0\u5728\u5207\u6362\u5230\u65b0\u521b\u5efa\u7684\u00a0testing\u00a0\u5206\u652f\u53bb\uff1a<\/p>\n
git checkout testing<\/pre>\n
\u8fd9\u6837\u00a0HEAD\u00a0\u5c31\u6307\u5411\u00a0testing\u00a0\u5206\u652f\u4e86\u3002<\/p>\n
$\"HEAD$ <\/p>\n
Figure 3-6.\u00a0HEAD \u6307\u5411\u5f53\u524d\u6240\u5728\u7684\u5206\u652f\u90a3\u4e48\uff0c\u8fd9\u6837\u7684\u5b9e\u73b0\u65b9\u5f0f\u4f1a\u7ed9\u6211\u4eec\u5e26\u6765\u4ec0\u4e48\u597d\u5904\u5462\uff1f \u73b0\u5728\u4e0d\u59a8\u518d\u63d0\u4ea4\u4e00\u6b21\uff1a<\/p>\n
vim test.rb\r\ngit commit -a -m 'made a change'<\/pre>\n
$\"HEAD$ <\/p>\n
Figure 3-7.\u00a0HEAD \u5206\u652f\u968f\u7740\u63d0\u4ea4\u64cd\u4f5c\u81ea\u52a8\u5411\u524d\u79fb\u52a8\u5982\u56fe\u6240\u793a\uff0c\u4f60\u7684testing\u5206\u652f\u5411\u524d\u79fb\u52a8\u4e86\uff0c\u4f46\u662f\u00a0master\u00a0\u5206\u652f\u5374\u6ca1\u6709\uff0c\u5b83\u4ecd\u7136\u6307\u5411\u8fd0\u884c\u00a0git checkout\u00a0\u65f6\u6240\u6307\u7684\u5bf9\u8c61\u3002 \u8fd9\u5c31\u6709\u610f\u601d\u4e86\uff0c\u73b0\u5728\u6211\u4eec\u5207\u6362\u56de\u00a0master\u00a0\u5206\u652f\u770b\u770b\uff1a<\/p>\n
git checkout master<\/pre>\n
$\"\u68c0\u51fa\u65f6$ <\/p>\n
Figure 3-8.\u00a0\u68c0\u51fa\u65f6 HEAD \u968f\u4e4b\u79fb\u52a8\u8fd9\u6761\u547d\u4ee4\u505a\u4e86\u4e24\u4ef6\u4e8b\u3002 \u4e00\u662f\u4f7f HEAD \u6307\u56de\u00a0master\u00a0\u5206\u652f\uff0c\u4e8c\u662f\u5c06\u5de5\u4f5c\u76ee\u5f55\u6062\u590d\u6210\u00a0master\u00a0\u5206\u652f\u6240\u6307\u5411\u7684\u5feb\u7167\u5185\u5bb9\u3002 \u4e5f\u5c31\u662f\u8bf4\uff0c\u4f60\u73b0\u5728\u505a\u4fee\u6539\u7684\u8bdd\uff0c\u9879\u76ee\u5c06\u59cb\u4e8e\u4e00\u4e2a\u8f83\u65e7\u7684\u7248\u672c\u3002 \u672c\u8d28\u4e0a\u6765\u8bb2\uff0c\u8fd9\u5c31\u662f\u5ffd\u7565testing\u00a0\u5206\u652f\u6240\u505a\u7684\u4fee\u6539\uff0c\u4ee5\u4fbf\u4e8e\u5411\u53e6\u4e00\u4e2a\u65b9\u5411\u8fdb\u884c\u5f00\u53d1\u3002<\/p>\n
\u5206\u652f\u5207\u6362\u4f1a\u6539\u53d8\u4f60\u5de5\u4f5c\u76ee\u5f55\u4e2d\u7684\u6587\u4ef6<\/strong><\/div>\n
\u5728\u5207\u6362\u5206\u652f\u65f6\uff0c\u4e00\u5b9a\u8981\u6ce8\u610f\u4f60\u5de5\u4f5c\u76ee\u5f55\u91cc\u7684\u6587\u4ef6\u4f1a\u88ab\u6539\u53d8\u3002 \u5982\u679c\u662f\u5207\u6362\u5230\u4e00\u4e2a\u8f83\u65e7\u7684\u5206\u652f\uff0c\u4f60\u7684\u5de5\u4f5c\u76ee\u5f55\u4f1a\u6062\u590d\u5230\u8be5\u5206\u652f\u6700\u540e\u4e00\u6b21\u63d0\u4ea4\u65f6\u7684\u6837\u5b50\u3002 \u5982\u679c Git \u4e0d\u80fd\u5e72\u51c0\u5229\u843d\u5730\u5b8c\u6210\u8fd9\u4e2a\u4efb\u52a1\uff0c\u5b83\u5c06\u7981\u6b62\u5207\u6362\u5206\u652f\u3002<\/p>\n
\u6211\u4eec\u4e0d\u59a8\u518d\u7a0d\u5fae\u505a\u4e9b\u4fee\u6539\u5e76\u63d0\u4ea4\uff1a<\/p>\n
$ vim test.rb\r\n$ git commit -a -m 'made other changes'<\/pre>\n
\u73b0\u5728\uff0c\u8fd9\u4e2a\u9879\u76ee\u7684\u63d0\u4ea4\u5386\u53f2\u5df2\u7ecf\u4ea7\u751f\u4e86\u5206\u53c9\uff08\u53c2\u89c1\u00a0 Figure\u00a03-9<\/a>\uff09\u3002 \u56e0\u4e3a\u521a\u624d\u4f60\u521b\u5efa\u4e86\u4e00\u4e2a\u65b0\u5206\u652f\uff0c\u5e76\u5207\u6362\u8fc7\u53bb\u8fdb\u884c\u4e86\u4e00\u4e9b\u5de5\u4f5c\uff0c\u968f\u540e\u53c8\u5207\u6362\u56de master \u5206\u652f\u8fdb\u884c\u4e86\u53e6\u5916\u4e00\u4e9b\u5de5\u4f5c\u3002 \u4e0a\u8ff0\u4e24\u6b21\u6539\u52a8\u9488\u5bf9\u7684\u662f\u4e0d\u540c\u5206\u652f\uff1a\u4f60\u53ef\u4ee5\u5728\u4e0d\u540c\u5206\u652f\u95f4\u4e0d\u65ad\u5730\u6765\u56de\u5207\u6362\u548c\u5de5\u4f5c\uff0c\u5e76\u5728\u65f6\u673a\u6210\u719f\u65f6\u5c06\u5b83\u4eec\u5408\u5e76\u8d77\u6765\u3002 \u800c\u6240\u6709\u8fd9\u4e9b\u5de5\u4f5c\uff0c\u4f60\u9700\u8981\u7684\u547d\u4ee4\u53ea\u6709\u00a0branch\u3001checkout\u00a0\u548c\u00a0commit\u3002<\/p>\n
$\"\u9879\u76ee\u5206\u53c9\u5386\u53f2.\"$ <\/p>\n
Figure 3-9.\u00a0\u9879\u76ee\u5206\u53c9\u5386\u53f2\u4f60\u53ef\u4ee5\u7b80\u5355\u5730\u4f7f\u7528\u00a0git log\u00a0\u547d\u4ee4\u67e5\u770b\u5206\u53c9\u5386\u53f2\u3002 \u8fd0\u884c\u00a0git log --oneline --decorate --graph --all\u00a0\uff0c\u5b83\u4f1a\u8f93\u51fa\u4f60\u7684\u63d0\u4ea4\u5386\u53f2\u3001\u5404\u4e2a\u5206\u652f\u7684\u6307\u5411\u4ee5\u53ca\u9879\u76ee\u7684\u5206\u652f\u5206\u53c9\u60c5\u51b5\u3002<\/p>\n
$ git log --oneline --decorate --graph --all\r\n* c2b9e (HEAD, master) made other changes\r\n| * 87ab2 (testing) made a change\r\n|\/\r\n* f30ab add feature #32 - ability to add new formats to the\r\n* 34ac2 fixed bug #1328 - stack overflow under certain conditions\r\n* 98ca9 initial commit of my project<\/pre>\n
\u7531\u4e8e Git \u7684\u5206\u652f\u5b9e\u8d28\u4e0a\u4ec5\u662f\u5305\u542b\u6240\u6307\u5bf9\u8c61\u6821\u9a8c\u548c\uff08\u957f\u5ea6\u4e3a 40 \u7684 SHA-1 \u503c\u5b57\u7b26\u4e32\uff09\u7684\u6587\u4ef6\uff0c\u6240\u4ee5\u5b83\u7684\u521b\u5efa\u548c\u9500\u6bc1\u90fd\u5f02\u5e38\u9ad8\u6548\u3002 \u521b\u5efa\u4e00\u4e2a\u65b0\u5206\u652f\u5c31\u50cf\u662f\u5f80\u4e00\u4e2a\u6587\u4ef6\u4e2d\u5199\u5165 41 \u4e2a\u5b57\u8282\uff0840 \u4e2a\u5b57\u7b26\u548c 1 \u4e2a\u6362\u884c\u7b26\uff09\uff0c\u5982\u6b64\u7684\u7b80\u5355\u80fd\u4e0d\u5feb\u5417\uff1f<\/p>\n
\u8fd9\u4e0e\u8fc7\u53bb\u5927\u591a\u6570\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u5f62\u6210\u4e86\u9c9c\u660e\u7684\u5bf9\u6bd4\uff0c\u5b83\u4eec\u5728\u521b\u5efa\u5206\u652f\u65f6\uff0c\u5c06\u6240\u6709\u7684\u9879\u76ee\u6587\u4ef6\u90fd\u590d\u5236\u4e00\u904d\uff0c\u5e76\u4fdd\u5b58\u5230\u4e00\u4e2a\u7279\u5b9a\u7684\u76ee\u5f55\u3002 \u5b8c\u6210\u8fd9\u6837\u7e41\u7410\u7684\u8fc7\u7a0b\u901a\u5e38\u9700\u8981\u597d\u51e0\u79d2\u949f\uff0c\u6709\u65f6\u751a\u81f3\u9700\u8981\u597d\u51e0\u5206\u949f\u3002\u6240\u9700\u65f6\u95f4\u7684\u957f\u77ed\uff0c\u5b8c\u5168\u53d6\u51b3\u4e8e\u9879\u76ee\u7684\u89c4\u6a21\u3002\u800c\u5728 Git \u4e2d\uff0c\u4efb\u4f55\u89c4\u6a21\u7684\u9879\u76ee\u90fd\u80fd\u5728\u77ac\u95f4\u521b\u5efa\u65b0\u5206\u652f\u3002 \u540c\u65f6\uff0c\u7531\u4e8e\u6bcf\u6b21\u63d0\u4ea4\u90fd\u4f1a\u8bb0\u5f55\u7236\u5bf9\u8c61\uff0c\u6240\u4ee5\u5bfb\u627e\u6070\u5f53\u7684\u5408\u5e76\u57fa\u7840\uff08\u8bd1\u6ce8\uff1a\u5373\u5171\u540c\u7956\u5148\uff09\u4e5f\u662f\u540c\u6837\u7684\u7b80\u5355\u548c\u9ad8\u6548\u3002 \u8fd9\u4e9b\u9ad8\u6548\u7684\u7279\u6027\u4f7f\u5f97 Git \u9f13\u52b1\u5f00\u53d1\u4eba\u5458\u9891\u7e41\u5730\u521b\u5efa\u548c\u4f7f\u7528\u5206\u652f\u3002<\/p>\n
\u63a5\u4e0b\u6765\uff0c\u8ba9\u6211\u4eec\u770b\u770b\u4e3a\u4ec0\u4e48\u4f60\u5e94\u8be5\u8fd9\u4e48\u505a\uff1f<\/p>\n
Git \u5206\u652f - \u5206\u652f\u7684\u65b0\u5efa\u4e0e\u5408\u5e76<\/strong><\/div>\n\u5206\u652f\u7684\u65b0\u5efa\u4e0e\u5408\u5e76<\/strong><\/span><\/div>\n
\u8ba9\u6211\u4eec\u6765\u770b\u4e00\u4e2a\u7b80\u5355\u7684\u5206\u652f\u65b0\u5efa\u4e0e\u5206\u652f\u5408\u5e76\u7684\u4f8b\u5b50\uff0c\u5b9e\u9645\u5de5\u4f5c\u4e2d\u4f60\u53ef\u80fd\u4f1a\u7528\u5230\u7c7b\u4f3c\u7684\u5de5\u4f5c\u6d41\u3002 \u4f60\u5c06\u7ecf\u5386\u5982\u4e0b\u6b65\u9aa4\uff1a<\/p>\n
\n
\u5f00\u53d1\u67d0\u4e2a\u7f51\u7ad9\u3002<\/li>\n
\u4e3a\u5b9e\u73b0\u67d0\u4e2a\u65b0\u7684\u9700\u6c42\uff0c\u521b\u5efa\u4e00\u4e2a\u5206\u652f\u3002<\/li>\n
\u5728\u8fd9\u4e2a\u5206\u652f\u4e0a\u5f00\u5c55\u5de5\u4f5c\u3002<\/li>\n<\/ul>\n
\u6b63\u5728\u6b64\u65f6\uff0c\u4f60\u7a81\u7136\u63a5\u5230\u4e00\u4e2a\u7535\u8bdd\u8bf4\u6709\u4e2a\u5f88\u4e25\u91cd\u7684\u95ee\u9898\u9700\u8981\u7d27\u6025\u4fee\u8865\u3002 \u4f60\u5c06\u6309\u7167\u5982\u4e0b\u65b9\u5f0f\u6765\u5904\u7406\uff1a<\/p>\n
\n
\u5207\u6362\u5230\u4f60\u7684\u7ebf\u4e0a\u5206\u652f\uff08production branch\uff09\u3002<\/li>\n
\u4e3a\u8fd9\u4e2a\u7d27\u6025\u4efb\u52a1\u65b0\u5efa\u4e00\u4e2a\u5206\u652f\uff0c\u5e76\u5728\u5176\u4e2d\u4fee\u590d\u5b83\u3002<\/li>\n
\u5728\u6d4b\u8bd5\u901a\u8fc7\u4e4b\u540e\uff0c\u5207\u6362\u56de\u7ebf\u4e0a\u5206\u652f\uff0c\u7136\u540e\u5408\u5e76\u8fd9\u4e2a\u4fee\u8865\u5206\u652f\uff0c\u6700\u540e\u5c06\u6539\u52a8\u63a8\u9001\u5230\u7ebf\u4e0a\u5206\u652f\u3002<\/li>\n
\u5207\u6362\u56de\u4f60\u6700\u521d\u5de5\u4f5c\u7684\u5206\u652f\u4e0a\uff0c\u7ee7\u7eed\u5de5\u4f5c\u3002<\/li>\n<\/ul>\n
\u65b0\u5efa\u5206\u652f<\/strong><\/span><\/div>\n<\/a>\u9996\u5148\uff0c\u6211\u4eec\u5047\u8bbe\u4f60\u6b63\u5728\u4f60\u7684\u9879\u76ee\u4e0a\u5de5\u4f5c\uff0c\u5e76\u4e14\u5df2\u7ecf\u6709\u4e00\u4e9b\u63d0\u4ea4\u3002
\n $\"\u4e00\u4e2a\u7b80\u5355\u7684\u63d0\u4ea4\u5386\u53f2\u3002\"$ <\/p>\n
Figure 3-10.\u00a0\u4e00\u4e2a\u7b80\u5355\u63d0\u4ea4\u5386\u53f2\u73b0\u5728\uff0c\u4f60\u5df2\u7ecf\u51b3\u5b9a\u8981\u89e3\u51b3\u4f60\u7684\u516c\u53f8\u4f7f\u7528\u7684\u95ee\u9898\u8ffd\u8e2a\u7cfb\u7edf\u4e2d\u7684 #53 \u95ee\u9898\u3002 \u60f3\u8981\u65b0\u5efa\u4e00\u4e2a\u5206\u652f\u5e76\u540c\u65f6\u5207\u6362\u5230\u90a3\u4e2a\u5206\u652f\u4e0a\uff0c\u4f60\u53ef\u4ee5\u8fd0\u884c\u4e00\u4e2a\u5e26\u6709\u00a0-b\u00a0\u53c2\u6570\u7684\u00a0git checkout\u00a0\u547d\u4ee4\uff1a<\/p>\n
$ git checkout -b iss53\r\nSwitched to a new branch \"iss53\"<\/pre>\n
\u5b83\u662f\u4e0b\u9762\u4e24\u6761\u547d\u4ee4\u7684\u7b80\u5199\uff1a<\/p>\n
$ git branch iss53\r\n$ git checkout iss53<\/pre>\n
$\"\u521b\u5efa\u4e00\u4e2a\u65b0\u5206\u652f\u6307\u9488\u3002\"$ <\/p>\n
Figure 3-11.\u00a0\u521b\u5efa\u4e00\u4e2a\u65b0\u5206\u652f\u6307\u9488\u4f60\u7ee7\u7eed\u5728 #53 \u95ee\u9898\u4e0a\u5de5\u4f5c\uff0c\u5e76\u4e14\u505a\u4e86\u4e00\u4e9b\u63d0\u4ea4\u3002 \u5728\u6b64\u8fc7\u7a0b\u4e2d\uff0ciss53\u00a0\u5206\u652f\u5728\u4e0d\u65ad\u7684\u5411\u524d\u63a8\u8fdb\uff0c\u56e0\u4e3a\u4f60\u5df2\u7ecf\u68c0\u51fa\u5230\u8be5\u5206\u652f\uff08\u4e5f\u5c31\u662f\u8bf4\uff0c\u4f60\u7684\u00a0HEAD\u00a0\u6307\u9488\u6307\u5411\u4e86\u00a0iss53\u00a0\u5206\u652f\uff09<\/p>\n
$ vim index.html\r\n$ git commit -a -m 'added a new footer [issue 53]'<\/pre>\n
$\"iss53$ <\/p>\n
Figure 3-12.\u00a0iss53 \u5206\u652f\u968f\u7740\u5de5\u4f5c\u7684\u8fdb\u5c55\u5411\u524d\u63a8\u8fdb\u73b0\u5728\u4f60\u63a5\u5230\u90a3\u4e2a\u7535\u8bdd\uff0c\u6709\u4e2a\u7d27\u6025\u95ee\u9898\u7b49\u5f85\u4f60\u6765\u89e3\u51b3\u3002 \u6709\u4e86 Git \u7684\u5e2e\u52a9\uff0c\u4f60\u4e0d\u5fc5\u628a\u8fd9\u4e2a\u7d27\u6025\u95ee\u9898\u548c\u00a0iss53\u7684\u4fee\u6539\u6df7\u5728\u4e00\u8d77\uff0c\u4f60\u4e5f\u4e0d\u9700\u8981\u82b1\u5927\u529b\u6c14\u6765\u8fd8\u539f\u5173\u4e8e 53# \u95ee\u9898\u7684\u4fee\u6539\uff0c\u7136\u540e\u518d\u6dfb\u52a0\u5173\u4e8e\u8fd9\u4e2a\u7d27\u6025\u95ee\u9898\u7684\u4fee\u6539\uff0c\u6700\u540e\u5c06\u8fd9\u4e2a\u4fee\u6539\u63d0\u4ea4\u5230\u7ebf\u4e0a\u5206\u652f\u3002 \u4f60\u6240\u8981\u505a\u7684\u4ec5\u4ec5\u662f\u5207\u6362\u56de\u00a0master\u00a0\u5206\u652f\u3002<\/p>\n
\u4f46\u662f\uff0c\u5728\u4f60\u8fd9\u4e48\u505a\u4e4b\u524d\uff0c\u8981\u7559\u610f\u4f60\u7684\u5de5\u4f5c\u76ee\u5f55\u548c\u6682\u5b58\u533a\u91cc\u90a3\u4e9b\u8fd8\u6ca1\u6709\u88ab\u63d0\u4ea4\u7684\u4fee\u6539\uff0c\u5b83\u53ef\u80fd\u4f1a\u548c\u4f60\u5373\u5c06\u68c0\u51fa\u7684\u5206\u652f\u4ea7\u751f\u51b2\u7a81\u4ece\u800c\u963b\u6b62 Git \u5207\u6362\u5230\u8be5\u5206\u652f\u3002 \u6700\u597d\u7684\u65b9\u6cd5\u662f\uff0c\u5728\u4f60\u5207\u6362\u5206\u652f\u4e4b\u524d\uff0c\u4fdd\u6301\u597d\u4e00\u4e2a\u5e72\u51c0\u7684\u72b6\u6001\u3002 \u6709\u4e00\u4e9b\u65b9\u6cd5\u53ef\u4ee5\u7ed5\u8fc7\u8fd9\u4e2a\u95ee\u9898\uff08\u5373\uff0c\u4fdd\u5b58\u8fdb\u5ea6\uff08stashing\uff09 \u548c \u4fee\u8865\u63d0\u4ea4\uff08commit amending\uff09\uff09\uff0c\u6211\u4eec\u4f1a\u5728\u00a0 \u50a8\u85cf\u4e0e\u6e05\u7406<\/a>\u00a0\u4e2d\u770b\u5230\u5173\u4e8e\u8fd9\u4e24\u4e2a\u547d\u4ee4\u7684\u4ecb\u7ecd\u3002 \u73b0\u5728\uff0c\u6211\u4eec\u5047\u8bbe\u4f60\u5df2\u7ecf\u628a\u4f60\u7684\u4fee\u6539\u5168\u90e8\u63d0\u4ea4\u4e86\uff0c\u8fd9\u65f6\u4f60\u53ef\u4ee5\u5207\u6362\u56de\u00a0master\u00a0\u5206\u652f\u4e86\uff1a<\/p>\n
$ git checkout master\r\nSwitched to branch 'master'<\/pre>\n
\u8fd9\u4e2a\u65f6\u5019\uff0c\u4f60\u7684\u5de5\u4f5c\u76ee\u5f55\u548c\u4f60\u5728\u5f00\u59cb #53 \u95ee\u9898\u4e4b\u524d\u4e00\u6a21\u4e00\u6837\uff0c\u73b0\u5728\u4f60\u53ef\u4ee5\u4e13\u5fc3\u4fee\u590d\u7d27\u6025\u95ee\u9898\u4e86\u3002 \u8bf7\u7262\u8bb0\uff1a\u5f53\u4f60\u5207\u6362\u5206\u652f\u7684\u65f6\u5019\uff0cGit \u4f1a\u91cd\u7f6e\u4f60\u7684\u5de5\u4f5c\u76ee\u5f55\uff0c\u4f7f\u5176\u770b\u8d77\u6765\u50cf\u56de\u5230\u4e86\u4f60\u5728\u90a3\u4e2a\u5206\u652f\u4e0a\u6700\u540e\u4e00\u6b21\u63d0\u4ea4\u7684\u6837\u5b50\u3002 Git \u4f1a\u81ea\u52a8\u6dfb\u52a0\u3001\u5220\u9664\u3001\u4fee\u6539\u6587\u4ef6\u4ee5\u786e\u4fdd\u6b64\u65f6\u4f60\u7684\u5de5\u4f5c\u76ee\u5f55\u548c\u8fd9\u4e2a\u5206\u652f\u6700\u540e\u4e00\u6b21\u63d0\u4ea4\u65f6\u7684\u6837\u5b50\u4e00\u6a21\u4e00\u6837\u3002<\/p>\n
\u63a5\u4e0b\u6765\uff0c\u4f60\u8981\u4fee\u590d\u8fd9\u4e2a\u7d27\u6025\u95ee\u9898\u3002 \u8ba9\u6211\u4eec\u5efa\u7acb\u4e00\u4e2a\u9488\u5bf9\u8be5\u7d27\u6025\u95ee\u9898\u7684\u5206\u652f\uff08hotfix branch\uff09\uff0c\u5728\u8be5\u5206\u652f\u4e0a\u5de5\u4f5c\u76f4\u5230\u95ee\u9898\u89e3\u51b3\uff1a<\/p>\n
$ git checkout -b hotfix\r\nSwitched to a new branch 'hotfix'\r\n$ vim index.html\r\n$ git commit -a -m 'fixed the broken email address'\r\n[hotfix 1fb7853] fixed the broken email address\r\n 1 file changed, 2 insertions(+)<\/pre>\n
$\"\u57fa\u4e8e$ <\/p>\n
Figure 3-13.\u00a0\u57fa\u4e8e\u00a0master\u00a0\u5206\u652f\u7684\u7d27\u6025\u95ee\u9898\u5206\u652f\u00a0hotfix branch\u4f60\u53ef\u4ee5\u8fd0\u884c\u4f60\u7684\u6d4b\u8bd5\uff0c\u786e\u4fdd\u4f60\u7684\u4fee\u6539\u662f\u6b63\u786e\u7684\uff0c\u7136\u540e\u5c06\u5176\u5408\u5e76\u56de\u4f60\u7684\u00a0master\u00a0\u5206\u652f\u6765\u90e8\u7f72\u5230\u7ebf\u4e0a\u3002 \u4f60\u53ef\u4ee5\u4f7f\u7528\u00a0git merge\u00a0\u547d\u4ee4\u6765\u8fbe\u5230\u4e0a\u8ff0\u76ee\u7684\uff1a <\/a><\/p>\n
$ git checkout master\r\n$ git merge hotfix\r\nUpdating f42c576..3a0874c\r\nFast-forward\r\n index.html | 2 ++\r\n 1 file changed, 2 insertions(+)<\/pre>\n
\u5728\u5408\u5e76\u7684\u65f6\u5019\uff0c\u4f60\u5e94\u8be5\u6ce8\u610f\u5230\u4e86\"\u5feb\u8fdb\uff08fast-forward\uff09\"\u8fd9\u4e2a\u8bcd\u3002 \u7531\u4e8e\u5f53\u524d\u00a0master\u00a0\u5206\u652f\u6240\u6307\u5411\u7684\u63d0\u4ea4\u662f\u4f60\u5f53\u524d\u63d0\u4ea4\uff08\u6709\u5173 hotfix \u7684\u63d0\u4ea4\uff09\u7684\u76f4\u63a5\u4e0a\u6e38\uff0c\u6240\u4ee5 Git \u53ea\u662f\u7b80\u5355\u7684\u5c06\u6307\u9488\u5411\u524d\u79fb\u52a8\u3002 \u6362\u53e5\u8bdd\u8bf4\uff0c\u5f53\u4f60\u8bd5\u56fe\u5408\u5e76\u4e24\u4e2a\u5206\u652f\u65f6\uff0c\u5982\u679c\u987a\u7740\u4e00\u4e2a\u5206\u652f\u8d70\u4e0b\u53bb\u80fd\u591f\u5230\u8fbe\u53e6\u4e00\u4e2a\u5206\u652f\uff0c\u90a3\u4e48 Git \u5728\u5408\u5e76\u4e24\u8005\u7684\u65f6\u5019\uff0c\u53ea\u4f1a\u7b80\u5355\u7684\u5c06\u6307\u9488\u5411\u524d\u63a8\u8fdb\uff08\u6307\u9488\u53f3\u79fb\uff09\uff0c\u56e0\u4e3a\u8fd9\u79cd\u60c5\u51b5\u4e0b\u7684\u5408\u5e76\u64cd\u4f5c\u6ca1\u6709\u9700\u8981\u89e3\u51b3\u7684\u5206\u6b67\u2014\u2014\u8fd9\u5c31\u53eb\u505a \u201c\u5feb\u8fdb\uff08fast-forward\uff09\u201d\u3002<\/p>\n
\u73b0\u5728\uff0c\u6700\u65b0\u7684\u4fee\u6539\u5df2\u7ecf\u5728\u00a0master\u00a0\u5206\u652f\u6240\u6307\u5411\u7684\u63d0\u4ea4\u5feb\u7167\u4e2d\uff0c\u4f60\u53ef\u4ee5\u7740\u624b\u53d1\u5e03\u8be5\u4fee\u590d\u4e86\u3002<\/p>\n
$\"`master`$ <\/p>\n
Figure 3-14.\u00a0master\u00a0\u88ab\u5feb\u8fdb\u5230\u00a0hotfix\u5173\u4e8e\u8fd9\u4e2a\u7d27\u6025\u95ee\u9898\u7684\u89e3\u51b3\u65b9\u6848\u53d1\u5e03\u4e4b\u540e\uff0c\u4f60\u51c6\u5907\u56de\u5230\u88ab\u6253\u65ad\u4e4b\u524d\u65f6\u7684\u5de5\u4f5c\u4e2d\u3002 \u7136\u800c\uff0c\u4f60\u5e94\u8be5\u5148\u5220\u9664hotfix\u00a0\u5206\u652f\uff0c\u56e0\u4e3a\u4f60\u5df2\u7ecf\u4e0d\u518d\u9700\u8981\u5b83\u4e86 \u2014\u2014\u00a0master\u00a0\u5206\u652f\u5df2\u7ecf\u6307\u5411\u4e86\u540c\u4e00\u4e2a\u4f4d\u7f6e\u3002 \u4f60\u53ef\u4ee5\u4f7f\u7528\u5e26\u00a0-d\u9009\u9879\u7684\u00a0git branch\u00a0\u547d\u4ee4\u6765\u5220\u9664\u5206\u652f\uff1a<\/p>\n
$ git branch -d hotfix\r\nDeleted branch hotfix (3a0874c).<\/pre>\n
\u73b0\u5728\u4f60\u53ef\u4ee5\u5207\u6362\u56de\u4f60\u6b63\u5728\u5de5\u4f5c\u7684\u5206\u652f\u7ee7\u7eed\u4f60\u7684\u5de5\u4f5c\uff0c\u4e5f\u5c31\u662f\u9488\u5bf9 #53 \u95ee\u9898\u7684\u90a3\u4e2a\u5206\u652f\uff08iss53 \u5206\u652f\uff09\u3002<\/p>\n
$ git checkout iss53\r\nSwitched to branch \"iss53\"\r\n$ vim index.html\r\n$ git commit -a -m 'finished the new footer [issue 53]'\r\n[iss53 ad82d7a] finished the new footer [issue 53]\r\n1 file changed, 1 insertion(+)<\/pre>\n
$\"\u7ee7\u7eed\u5728$ <\/p>\n
Figure 3-15.\u00a0\u7ee7\u7eed\u5728\u00a0iss53\u00a0\u5206\u652f\u4e0a\u7684\u5de5\u4f5c\u4f60\u5728\u00a0hotfix\u00a0\u5206\u652f\u4e0a\u6240\u505a\u7684\u5de5\u4f5c\u5e76\u6ca1\u6709\u5305\u542b\u5230\u00a0iss53\u00a0\u5206\u652f\u4e2d\u3002 \u5982\u679c\u4f60\u9700\u8981\u62c9\u53d6\u00a0hotfix\u00a0\u6240\u505a\u7684\u4fee\u6539\uff0c\u4f60\u53ef\u4ee5\u4f7f\u7528\u00a0git merge master\u00a0\u547d\u4ee4\u5c06\u00a0master\u00a0\u5206\u652f\u5408\u5e76\u5165\u00a0iss53\u00a0\u5206\u652f\uff0c\u6216\u8005\u4f60\u4e5f\u53ef\u4ee5\u7b49\u5230\u00a0iss53\u5206\u652f\u5b8c\u6210\u5176\u4f7f\u547d\uff0c\u518d\u5c06\u5176\u5408\u5e76\u56de\u00a0master\u00a0\u5206\u652f\u3002<\/p>\n
\u5206\u652f\u7684\u5408\u5e76<\/strong><\/span><\/div>\n<\/a><\/a>\u5047\u8bbe\u4f60\u5df2\u7ecf\u4fee\u6b63\u4e86 #53 \u95ee\u9898\uff0c\u5e76\u4e14\u6253\u7b97\u5c06\u4f60\u7684\u5de5\u4f5c\u5408\u5e76\u5165\u00a0master\u00a0\u5206\u652f\u3002 \u4e3a\u6b64\uff0c\u4f60\u9700\u8981\u5408\u5e76\u00a0iss53\u00a0\u5206\u652f\u5230\u00a0master\u00a0\u5206\u652f\uff0c\u8fd9\u548c\u4e4b\u524d\u4f60\u5408\u5e76\u00a0hotfix\u00a0\u5206\u652f\u6240\u505a\u7684\u5de5\u4f5c\u5dee\u4e0d\u591a\u3002 \u4f60\u53ea\u9700\u8981\u68c0\u51fa\u5230\u4f60\u60f3\u5408\u5e76\u5165\u7684\u5206\u652f\uff0c\u7136\u540e\u8fd0\u884c\u00a0git merge\u00a0\u547d\u4ee4\uff1a<\/p>\n
$ git checkout master\r\nSwitched to branch 'master'\r\n$ git merge iss53\r\nMerge made by the 'recursive' strategy.\r\nindex.html | 1 +\r\n1 file changed, 1 insertion(+)<\/pre>\n
\u8fd9\u548c\u4f60\u4e4b\u524d\u5408\u5e76\u00a0hotfix\u00a0\u5206\u652f\u7684\u65f6\u5019\u770b\u8d77\u6765\u6709\u4e00\u70b9\u4e0d\u4e00\u6837\u3002 \u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u4f60\u7684\u5f00\u53d1\u5386\u53f2\u4ece\u4e00\u4e2a\u66f4\u65e9\u7684\u5730\u65b9\u5f00\u59cb\u5206\u53c9\u5f00\u6765\uff08diverged\uff09\u3002 \u56e0\u4e3a\uff0cmaster\u00a0\u5206\u652f\u6240\u5728\u63d0\u4ea4\u5e76\u4e0d\u662f\u00a0iss53\u00a0\u5206\u652f\u6240\u5728\u63d0\u4ea4\u7684\u76f4\u63a5\u7956\u5148\uff0cGit \u4e0d\u5f97\u4e0d\u505a\u4e00\u4e9b\u989d\u5916\u7684\u5de5\u4f5c\u3002 \u51fa\u73b0\u8fd9\u79cd\u60c5\u51b5\u7684\u65f6\u5019\uff0cGit \u4f1a\u4f7f\u7528\u4e24\u4e2a\u5206\u652f\u7684\u672b\u7aef\u6240\u6307\u7684\u5feb\u7167\uff08C4\u548c\u00a0C5\uff09\u4ee5\u53ca\u8fd9\u4e24\u4e2a\u5206\u652f\u7684\u5de5\u4f5c\u7956\u5148\uff08C2\uff09\uff0c\u505a\u4e00\u4e2a\u7b80\u5355\u7684\u4e09\u65b9\u5408\u5e76\u3002<\/p>\n
$\"\u4e00\u6b21\u5178\u578b\u5408\u5e76\u4e2d\u6240\u7528\u5230\u7684\u4e09\u4e2a\u5feb\u7167\u3002\"$ <\/p>\n
Figure 3-16.\u00a0\u4e00\u6b21\u5178\u578b\u5408\u5e76\u4e2d\u6240\u7528\u5230\u7684\u4e09\u4e2a\u5feb\u7167\u548c\u4e4b\u95f4\u5c06\u5206\u652f\u6307\u9488\u5411\u524d\u63a8\u8fdb\u6240\u4e0d\u540c\u7684\u662f\uff0cGit \u5c06\u6b64\u6b21\u4e09\u65b9\u5408\u5e76\u7684\u7ed3\u679c\u505a\u4e86\u4e00\u4e2a\u65b0\u7684\u5feb\u7167\u5e76\u4e14\u81ea\u52a8\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u6307\u5411\u5b83\u3002 \u8fd9\u4e2a\u88ab\u79f0\u4f5c\u4e00\u6b21\u5408\u5e76\u63d0\u4ea4\uff0c\u5b83\u7684\u7279\u522b\u4e4b\u5904\u5728\u4e8e\u4ed6\u6709\u4e0d\u6b62\u4e00\u4e2a\u7236\u63d0\u4ea4\u3002<\/p>\n
$\"\u4e00\u4e2a\u5408\u5e76\u63d0\u4ea4\u3002\"$ <\/p>\n
Figure 3-17.\u00a0\u4e00\u4e2a\u5408\u5e76\u63d0\u4ea4\u9700\u8981\u6307\u51fa\u7684\u662f\uff0cGit \u4f1a\u81ea\u884c\u51b3\u5b9a\u9009\u53d6\u54ea\u4e00\u4e2a\u63d0\u4ea4\u4f5c\u4e3a\u6700\u4f18\u7684\u5171\u540c\u7956\u5148\uff0c\u5e76\u4ee5\u6b64\u4f5c\u4e3a\u5408\u5e76\u7684\u57fa\u7840\uff1b\u8fd9\u548c\u66f4\u52a0\u53e4\u8001\u7684 CVS \u7cfb\u7edf\u6216\u8005 Subversion \uff081.5 \u7248\u672c\u4e4b\u524d\uff09\u4e0d\u540c\uff0c\u5728\u8fd9\u4e9b\u53e4\u8001\u7684\u7248\u672c\u7ba1\u7406\u7cfb\u7edf\u4e2d\uff0c\u7528\u6237\u9700\u8981\u81ea\u5df1\u9009\u62e9\u6700\u4f73\u7684\u5408\u5e76\u57fa\u7840\u3002 Git \u7684\u8fd9\u4e2a\u4f18\u52bf\u4f7f\u5176\u5728\u5408\u5e76\u64cd\u4f5c\u4e0a\u6bd4\u5176\u4ed6\u7cfb\u7edf\u8981\u7b80\u5355\u5f88\u591a\u3002<\/p>\n
\u65e2\u7136\u4f60\u7684\u4fee\u6539\u5df2\u7ecf\u5408\u5e76\u8fdb\u6765\u4e86\uff0c\u4f60\u5df2\u7ecf\u4e0d\u518d\u9700\u8981\u00a0iss53\u00a0\u5206\u652f\u4e86\u3002 \u73b0\u5728\u4f60\u53ef\u4ee5\u5728\u4efb\u52a1\u8ffd\u8e2a\u7cfb\u7edf\u4e2d\u5173\u95ed\u6b64\u9879\u4efb\u52a1\uff0c\u5e76\u5220\u9664\u8fd9\u4e2a\u5206\u652f\u3002<\/p>\n
$ git branch -d iss53<\/pre>\n
\u9047\u5230\u51b2\u7a81\u65f6\u7684\u5206\u652f\u5408\u5e76<\/strong><\/span><\/div>\n<\/a>\u6709\u65f6\u5019\u5408\u5e76\u64cd\u4f5c\u4e0d\u4f1a\u5982\u6b64\u987a\u5229\u3002 \u5982\u679c\u4f60\u5728\u4e24\u4e2a\u4e0d\u540c\u7684\u5206\u652f\u4e2d\uff0c\u5bf9\u540c\u4e00\u4e2a\u6587\u4ef6\u7684\u540c\u4e00\u4e2a\u90e8\u5206\u8fdb\u884c\u4e86\u4e0d\u540c\u7684\u4fee\u6539\uff0cGit \u5c31\u6ca1\u6cd5\u5e72\u51c0\u7684\u5408\u5e76\u5b83\u4eec\u3002 \u5982\u679c\u4f60\u5bf9 #53 \u95ee\u9898\u7684\u4fee\u6539\u548c\u6709\u5173\u00a0hotfix\u00a0\u7684\u4fee\u6539\u90fd\u6d89\u53ca\u5230\u540c\u4e00\u4e2a\u6587\u4ef6\u7684\u540c\u4e00\u5904\uff0c\u5728\u5408\u5e76\u5b83\u4eec\u7684\u65f6\u5019\u5c31\u4f1a\u4ea7\u751f\u5408\u5e76\u51b2\u7a81\uff1a<\/p>\n
$ git merge iss53\r\nAuto-merging index.html\r\nCONFLICT (content): Merge conflict in index.html\r\nAutomatic merge failed; fix conflicts and then commit the result.<\/pre>\n
\u6b64\u65f6 Git \u505a\u4e86\u5408\u5e76\uff0c\u4f46\u662f\u6ca1\u6709\u81ea\u52a8\u5730\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5408\u5e76\u63d0\u4ea4\u3002 Git \u4f1a\u6682\u505c\u4e0b\u6765\uff0c\u7b49\u5f85\u4f60\u53bb\u89e3\u51b3\u5408\u5e76\u4ea7\u751f\u7684\u51b2\u7a81\u3002 \u4f60\u53ef\u4ee5\u5728\u5408\u5e76\u51b2\u7a81\u540e\u7684\u4efb\u610f\u65f6\u523b\u4f7f\u7528\u00a0git status\u00a0\u547d\u4ee4\u6765\u67e5\u770b\u90a3\u4e9b\u56e0\u5305\u542b\u5408\u5e76\u51b2\u7a81\u800c\u5904\u4e8e\u672a\u5408\u5e76\uff08unmerged\uff09\u72b6\u6001\u7684\u6587\u4ef6\uff1a<\/p>\n
$ git status\r\nOn branch master\r\nYou have unmerged paths.\r\n (fix conflicts and run \"git commit\")\r\n\r\nUnmerged paths:\r\n (use \"git add <file>...\" to mark resolution)\r\n\r\n both modified: index.html\r\n\r\nno changes added to commit (use \"git add\" and\/or \"git commit -a\")<\/pre>\n
\u4efb\u4f55\u56e0\u5305\u542b\u5408\u5e76\u51b2\u7a81\u800c\u6709\u5f85\u89e3\u51b3\u7684\u6587\u4ef6\uff0c\u90fd\u4f1a\u4ee5\u672a\u5408\u5e76\u72b6\u6001\u6807\u8bc6\u51fa\u6765\u3002 Git \u4f1a\u5728\u6709\u51b2\u7a81\u7684\u6587\u4ef6\u4e2d\u52a0\u5165\u6807\u51c6\u7684\u51b2\u7a81\u89e3\u51b3\u6807\u8bb0\uff0c\u8fd9\u6837\u4f60\u53ef\u4ee5\u6253\u5f00\u8fd9\u4e9b\u5305\u542b\u51b2\u7a81\u7684\u6587\u4ef6\u7136\u540e\u624b\u52a8\u89e3\u51b3\u51b2\u7a81\u3002 \u51fa\u73b0\u51b2\u7a81\u7684\u6587\u4ef6\u4f1a\u5305\u542b\u4e00\u4e9b\u7279\u6b8a\u533a\u6bb5\uff0c\u770b\u8d77\u6765\u50cf\u4e0b\u9762\u8fd9\u4e2a\u6837\u5b50\uff1a<\/p>\n
<<<<<<< HEAD:index.html\r\n<div id=\"footer\">contact : email.support@github.com<\/div>\r\n=======\r\n<div id=\"footer\">\r\n please contact us at support@github.com\r\n<\/div>\r\n>>>>>>> iss53:index.html<\/pre>\n
\u8fd9\u8868\u793a\u00a0HEAD\u00a0\u6240\u6307\u793a\u7684\u7248\u672c\uff08\u4e5f\u5c31\u662f\u4f60\u7684\u00a0master\u00a0\u5206\u652f\u6240\u5728\u7684\u4f4d\u7f6e\uff0c\u56e0\u4e3a\u4f60\u5728\u8fd0\u884c merge \u547d\u4ee4\u7684\u65f6\u5019\u5df2\u7ecf\u68c0\u51fa\u5230\u4e86\u8fd9\u4e2a\u5206\u652f\uff09\u5728\u8fd9\u4e2a\u533a\u6bb5\u7684\u4e0a\u534a\u90e8\u5206\uff08=======\u00a0\u7684\u4e0a\u534a\u90e8\u5206\uff09\uff0c\u800c\u00a0iss53\u00a0\u5206\u652f\u6240\u6307\u793a\u7684\u7248\u672c\u5728=======\u00a0\u7684\u4e0b\u534a\u90e8\u5206\u3002 \u4e3a\u4e86\u89e3\u51b3\u51b2\u7a81\uff0c\u4f60\u5fc5\u987b\u9009\u62e9\u4f7f\u7528\u7531\u00a0=======\u00a0\u5206\u5272\u7684\u4e24\u90e8\u5206\u4e2d\u7684\u4e00\u4e2a\uff0c\u6216\u8005\u4f60\u4e5f\u53ef\u4ee5\u81ea\u884c\u5408\u5e76\u8fd9\u4e9b\u5185\u5bb9\u3002 \u4f8b\u5982\uff0c\u4f60\u53ef\u4ee5\u901a\u8fc7\u628a\u8fd9\u6bb5\u5185\u5bb9\u6362\u6210\u4e0b\u9762\u7684\u6837\u5b50\u6765\u89e3\u51b3\u51b2\u7a81\uff1a<\/p>\n
<div id=\"footer\">\r\nplease contact us at email.support@github.com<\/div><\/pre>\n
\u4e0a\u8ff0\u7684\u51b2\u7a81\u89e3\u51b3\u65b9\u6848\u4ec5\u4fdd\u7559\u4e86\u5176\u4e2d\u4e00\u4e2a\u5206\u652f\u7684\u4fee\u6539\uff0c\u5e76\u4e14\u00a0<<<<<<<\u00a0,\u00a0=======\u00a0, \u548c\u00a0>>>>>>>\u00a0\u8fd9\u4e9b\u884c\u88ab\u5b8c\u5168\u5220\u9664\u4e86\u3002 \u5728\u4f60\u89e3\u51b3\u4e86\u6240\u6709\u6587\u4ef6\u91cc\u7684\u51b2\u7a81\u4e4b\u540e\uff0c\u5bf9\u6bcf\u4e2a\u6587\u4ef6\u4f7f\u7528\u00a0git add\u00a0\u547d\u4ee4\u6765\u5c06\u5176\u6807\u8bb0\u4e3a\u51b2\u7a81\u5df2\u89e3\u51b3\u3002 \u4e00\u65e6\u6682\u5b58\u8fd9\u4e9b\u539f\u672c\u6709\u51b2\u7a81\u7684\u6587\u4ef6\uff0cGit \u5c31\u4f1a\u5c06\u5b83\u4eec\u6807\u8bb0\u4e3a\u51b2\u7a81\u5df2\u89e3\u51b3\u3002<\/p>\n
\u5982\u679c\u4f60\u60f3\u4f7f\u7528\u56fe\u5f62\u5316\u5de5\u5177\u6765\u89e3\u51b3\u51b2\u7a81\uff0c\u4f60\u53ef\u4ee5\u8fd0\u884c\u00a0git mergetool\uff0c\u8be5\u547d\u4ee4\u4f1a\u4e3a\u4f60\u542f\u52a8\u4e00\u4e2a\u5408\u9002\u7684\u53ef\u89c6\u5316\u5408\u5e76\u5de5\u5177\uff0c\u5e76\u5e26\u9886\u4f60\u4e00\u6b65\u4e00\u6b65\u89e3\u51b3\u8fd9\u4e9b\u51b2\u7a81\uff1a <\/a><\/p>\n
$ git mergetool\r\n\r\nThis message is displayed because 'merge.tool' is not configured.\r\nSee 'git mergetool --tool-help' or 'git help config' for more details.\r\n'git mergetool' will now attempt to use one of the following tools:\r\nopendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc3 codecompare vimdiff emerge\r\nMerging:\r\nindex.html\r\n\r\nNormal merge conflict for 'index.html':\r\n {local}: modified file\r\n {remote}: modified file\r\nHit return to start merge resolution tool (opendiff):<\/pre>\n
\u5982\u679c\u4f60\u60f3\u4f7f\u7528\u9664\u9ed8\u8ba4\u5de5\u5177\uff08\u5728\u8fd9\u91cc Git \u4f7f\u7528\u00a0opendiff\u00a0\u505a\u4e3a\u9ed8\u8ba4\u7684\u5408\u5e76\u5de5\u5177\uff0c\u56e0\u4e3a\u4f5c\u8005\u5728 Mac \u4e0a\u8fd0\u884c\u8be5\u7a0b\u5e8f\uff09\u5916\u7684\u5176\u4ed6\u5408\u5e76\u5de5\u5177\uff0c\u4f60\u53ef\u4ee5\u5728 \u201c\u4e0b\u5217\u5de5\u5177\u4e2d\uff08one of the following tools\uff09\u201d \u8fd9\u53e5\u540e\u9762\u770b\u5230\u6240\u6709\u652f\u6301\u7684\u5408\u5e76\u5de5\u5177\u3002 \u7136\u540e\u8f93\u5165\u4f60\u559c\u6b22\u7684\u5de5\u5177\u540d\u5b57\u5c31\u53ef\u4ee5\u4e86\u3002<\/p>\n
\nNOTE<\/strong><\/p>\n
\u5982\u679c\u4f60\u9700\u8981\u66f4\u52a0\u9ad8\u7ea7\u7684\u5de5\u5177\u6765\u89e3\u51b3\u590d\u6742\u7684\u5408\u5e76\u51b2\u7a81\uff0c\u6211\u4eec\u4f1a\u5728\u00a0 \u9ad8\u7ea7\u5408\u5e76<\/a>\u00a0\u4ecb\u7ecd\u66f4\u591a\u5173\u4e8e\u5206\u652f\u5408\u5e76\u7684\u5185\u5bb9\u3002<\/p>\n<\/div>\n
\u7b49\u4f60\u9000\u51fa\u5408\u5e76\u5de5\u5177\u4e4b\u540e\uff0cGit \u4f1a\u8be2\u95ee\u521a\u624d\u7684\u5408\u5e76\u662f\u5426\u6210\u529f\u3002 \u5982\u679c\u4f60\u56de\u7b54\u662f\uff0cGit \u4f1a\u6682\u5b58\u90a3\u4e9b\u6587\u4ef6\u4ee5\u8868\u660e\u51b2\u7a81\u5df2\u89e3\u51b3\uff1a \u4f60\u53ef\u4ee5\u518d\u6b21\u8fd0\u884c\u00a0git status\u00a0\u6765\u786e\u8ba4\u6240\u6709\u7684\u5408\u5e76\u51b2\u7a81\u90fd\u5df2\u88ab\u89e3\u51b3\uff1a<\/p>\n
$ git status\r\nOn branch master\r\nAll conflicts fixed but you are still merging.\r\n (use \"git commit\" to conclude merge)\r\n\r\nChanges to be committed:\r\n\r\n modified: index.html<\/pre>\n
\u5982\u679c\u4f60\u5bf9\u7ed3\u679c\u611f\u5230\u6ee1\u610f\uff0c\u5e76\u4e14\u786e\u5b9a\u4e4b\u524d\u6709\u51b2\u7a81\u7684\u7684\u6587\u4ef6\u90fd\u5df2\u7ecf\u6682\u5b58\u4e86\uff0c\u8fd9\u65f6\u4f60\u53ef\u4ee5\u8f93\u5165\u00a0git commit\u00a0\u6765\u5b8c\u6210\u5408\u5e76\u63d0\u4ea4\u3002 \u9ed8\u8ba4\u60c5\u51b5\u4e0b\u63d0\u4ea4\u4fe1\u606f\u770b\u8d77\u6765\u50cf\u4e0b\u9762\u8fd9\u4e2a\u6837\u5b50\uff1a<\/p>\n
Merge branch 'iss53'\r\n\r\nConflicts:\r\n index.html\r\n#\r\n# It looks like you may be committing a merge.\r\n# If this is not correct, please remove the file\r\n#\t.git\/MERGE_HEAD\r\n# and try again.\r\n\r\n\r\n# Please enter the commit message for your changes. Lines starting\r\n# '#' will be ignored, and an empty message aborts the commit.\r\n# On branch master\r\n# All conflicts fixed but you are still merging.\r\n#\r\n# Changes to be committed:\r\n#\tmodified: index.html\r\n#<\/pre>\n
\u5982\u679c\u4f60\u89c9\u5f97\u4e0a\u8ff0\u7684\u4fe1\u606f\u4e0d\u591f\u5145\u5206\uff0c\u4e0d\u80fd\u5b8c\u5168\u4f53\u73b0\u5206\u652f\u5408\u5e76\u7684\u8fc7\u7a0b\uff0c\u4f60\u53ef\u4ee5\u4fee\u6539\u4e0a\u8ff0\u4fe1\u606f\uff0c\u6dfb\u52a0\u4e00\u4e9b\u7ec6\u8282\u7ed9\u672a\u6765\u68c0\u89c6\u8fd9\u4e2a\u5408\u5e76\u7684\u8bfb\u8005\u4e00\u4e9b\u5e2e\u52a9\uff0c\u544a\u8bc9\u4ed6\u4eec\u4f60\u662f\u5982\u4f55\u89e3\u51b3\u5408\u5e76\u51b2\u7a81\u7684\uff0c\u4ee5\u53ca\u7406\u7531\u662f\u4ec0\u4e48\u3002<\/p>\n
Git \u5206\u652f - \u5206\u652f\u7ba1\u7406<\/strong><\/div>\n\u5206\u652f\u7ba1\u7406<\/strong><\/span><\/div>\n<\/a>\u73b0\u5728\u5df2\u7ecf\u521b\u5efa\u3001\u5408\u5e76\u3001\u5220\u9664\u4e86\u4e00\u4e9b\u5206\u652f\uff0c\u8ba9\u6211\u4eec\u770b\u770b\u4e00\u4e9b\u5e38\u7528\u7684\u5206\u652f\u7ba1\u7406\u5de5\u5177\u3002<\/p>\n
git branch\u00a0\u547d\u4ee4\u4e0d\u53ea\u662f\u53ef\u4ee5\u521b\u5efa\u4e0e\u5220\u9664\u5206\u652f\u3002 <\/a>\u00a0\u5982\u679c\u4e0d\u52a0\u4efb\u4f55\u53c2\u6570\u8fd0\u884c\u5b83\uff0c\u4f1a\u5f97\u5230\u5f53\u524d\u6240\u6709\u5206\u652f\u7684\u4e00\u4e2a\u5217\u8868\uff1a<\/p>\n
$ git branch\r\n iss53\r\n* master\r\n testing<\/pre>\n
\u6ce8\u610f\u00a0master\u00a0\u5206\u652f\u524d\u7684\u00a0*\u00a0\u5b57\u7b26\uff1a\u5b83\u4ee3\u8868\u73b0\u5728\u68c0\u51fa\u7684\u90a3\u4e00\u4e2a\u5206\u652f\uff08\u4e5f\u5c31\u662f\u8bf4\uff0c\u5f53\u524d\u00a0HEAD\u00a0\u6307\u9488\u6240\u6307\u5411\u7684\u5206\u652f\uff09\u3002 \u8fd9\u610f\u5473\u7740\u5982\u679c\u5728\u8fd9\u65f6\u5019\u63d0\u4ea4\uff0cmaster\u00a0\u5206\u652f\u5c06\u4f1a\u968f\u7740\u65b0\u7684\u5de5\u4f5c\u5411\u524d\u79fb\u52a8\u3002 \u5982\u679c\u9700\u8981\u67e5\u770b\u6bcf\u4e00\u4e2a\u5206\u652f\u7684\u6700\u540e\u4e00\u6b21\u63d0\u4ea4\uff0c\u53ef\u4ee5\u8fd0\u884c\u00a0git branch -v\u00a0\u547d\u4ee4\uff1a<\/p>\n
$ git branch -v\r\n iss53 93b412c fix javascript issue\r\n* master 7a98805 Merge branch 'iss53'\r\n testing 782fd34 add scott to the author list in the readmes<\/pre>\n
--merged\u00a0\u4e0e\u00a0--no-merged\u00a0\u8fd9\u4e24\u4e2a\u6709\u7528\u7684\u9009\u9879\u53ef\u4ee5\u8fc7\u6ee4\u8fd9\u4e2a\u5217\u8868\u4e2d\u5df2\u7ecf\u5408\u5e76\u6216\u5c1a\u672a\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\u7684\u5206\u652f\u3002 \u5982\u679c\u8981\u67e5\u770b\u54ea\u4e9b\u5206\u652f\u5df2\u7ecf\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\uff0c\u53ef\u4ee5\u8fd0\u884c\u00a0git branch --merged\uff1a<\/p>\n
$ git branch --merged\r\n iss53\r\n* master<\/pre>\n
\u56e0\u4e3a\u4e4b\u524d\u5df2\u7ecf\u5408\u5e76\u4e86\u00a0iss53\u00a0\u5206\u652f\uff0c\u6240\u4ee5\u73b0\u5728\u770b\u5230\u5b83\u5728\u5217\u8868\u4e2d\u3002 \u5728\u8fd9\u4e2a\u5217\u8868\u4e2d\u5206\u652f\u540d\u5b57\u524d\u6ca1\u6709\u00a0*\u00a0\u53f7\u7684\u5206\u652f\u901a\u5e38\u53ef\u4ee5\u4f7f\u7528\u00a0git branch -d\u00a0\u5220\u9664\u6389\uff1b\u4f60\u5df2\u7ecf\u5c06\u5b83\u4eec\u7684\u5de5\u4f5c\u6574\u5408\u5230\u4e86\u53e6\u4e00\u4e2a\u5206\u652f\uff0c\u6240\u4ee5\u5e76\u4e0d\u4f1a\u5931\u53bb\u4efb\u4f55\u4e1c\u897f\u3002<\/p>\n
\u67e5\u770b\u6240\u6709\u5305\u542b\u672a\u5408\u5e76\u5de5\u4f5c\u7684\u5206\u652f\uff0c\u53ef\u4ee5\u8fd0\u884c\u00a0git branch --no-merged\uff1a<\/p>\n
$ git branch --no-merged\r\n testing<\/pre>\n
\u8fd9\u91cc\u663e\u793a\u4e86\u5176\u4ed6\u5206\u652f\u3002 \u56e0\u4e3a\u5b83\u5305\u542b\u4e86\u8fd8\u672a\u5408\u5e76\u7684\u5de5\u4f5c\uff0c\u5c1d\u8bd5\u4f7f\u7528\u00a0git branch -d\u00a0\u547d\u4ee4\u5220\u9664\u5b83\u65f6\u4f1a\u5931\u8d25\uff1a<\/p>\n
$ git branch -d testing\r\nerror: The branch 'testing' is not fully merged.\r\nIf you are sure you want to delete it, run 'git branch -D testing'.<\/pre>\n
\u5982\u679c\u771f\u7684\u60f3\u8981\u5220\u9664\u5206\u652f\u5e76\u4e22\u6389\u90a3\u4e9b\u5de5\u4f5c\uff0c\u5982\u540c\u5e2e\u52a9\u4fe1\u606f\u91cc\u6240\u6307\u51fa\u7684\uff0c\u53ef\u4ee5\u4f7f\u7528\u00a0-D\u00a0\u9009\u9879\u5f3a\u5236\u5220\u9664\u5b83\u3002<\/p>\n
1.4 Git \u5206\u652f - \u5206\u652f\u5f00\u53d1\u5de5\u4f5c\u6d41<\/strong><\/div>\n\u5206\u652f\u5f00\u53d1\u5de5\u4f5c\u6d41<\/strong><\/span><\/div>\n
\u73b0\u5728\u4f60\u5df2\u7ecf\u5b66\u4f1a\u65b0\u5efa\u548c\u5408\u5e76\u5206\u652f\uff0c\u90a3\u4e48\u4f60\u53ef\u4ee5\u6216\u8005\u5e94\u8be5\u7528\u5b83\u6765\u505a\u4e9b\u4ec0\u4e48\u5462\uff1f \u5728\u672c\u8282\uff0c\u6211\u4eec\u4f1a\u4ecb\u7ecd\u4e00\u4e9b\u5e38\u89c1\u7684\u5229\u7528\u5206\u652f\u8fdb\u884c\u5f00\u53d1\u7684\u5de5\u4f5c\u6d41\u7a0b\u3002\u800c\u6b63\u662f\u7531\u4e8e\u5206\u652f\u7ba1\u7406\u7684\u4fbf\u6377\uff0c\u624d\u884d\u751f\u51fa\u8fd9\u4e9b\u5178\u578b\u7684\u5de5\u4f5c\u6a21\u5f0f\uff0c\u4f60\u53ef\u4ee5\u6839\u636e\u9879\u76ee\u5b9e\u9645\u60c5\u51b5\u9009\u62e9\u4e00\u79cd\u7528\u7528\u770b\u3002<\/p>\n
\u957f\u671f\u5206\u652f<\/strong><\/span><\/div>\n<\/a>\u56e0\u4e3a Git \u4f7f\u7528\u7b80\u5355\u7684\u4e09\u65b9\u5408\u5e76\uff0c\u6240\u4ee5\u5c31\u7b97\u5728\u4e00\u6bb5\u8f83\u957f\u7684\u65f6\u95f4\u5185\uff0c\u53cd\u590d\u628a\u4e00\u4e2a\u5206\u652f\u5408\u5e76\u5165\u53e6\u4e00\u4e2a\u5206\u652f\uff0c\u4e5f\u4e0d\u662f\u4ec0\u4e48\u96be\u4e8b\u3002 \u4e5f\u5c31\u662f\u8bf4\uff0c\u5728\u6574\u4e2a\u9879\u76ee\u5f00\u53d1\u5468\u671f\u7684\u4e0d\u540c\u9636\u6bb5\uff0c\u4f60\u53ef\u4ee5\u540c\u65f6\u62e5\u6709\u591a\u4e2a\u5f00\u653e\u7684\u5206\u652f\uff1b\u4f60\u53ef\u4ee5\u5b9a\u671f\u5730\u628a\u67d0\u4e9b\u7279\u6027\u5206\u652f\u5408\u5e76\u5165\u5176\u4ed6\u5206\u652f\u4e2d\u3002<\/p>\n
\u8bb8\u591a\u4f7f\u7528 Git \u7684\u5f00\u53d1\u8005\u90fd\u559c\u6b22\u4f7f\u7528\u8fd9\u79cd\u65b9\u5f0f\u6765\u5de5\u4f5c\uff0c\u6bd4\u5982\u53ea\u5728\u00a0master\u00a0\u5206\u652f\u4e0a\u4fdd\u7559\u5b8c\u5168\u7a33\u5b9a\u7684\u4ee3\u7801\u2014\u2014\u6709\u53ef\u80fd\u4ec5\u4ec5\u662f\u5df2\u7ecf\u53d1\u5e03\u6216\u5373\u5c06\u53d1\u5e03\u7684\u4ee3\u7801\u3002 \u4ed6\u4eec\u8fd8\u6709\u4e00\u4e9b\u540d\u4e3a\u00a0develop\u00a0\u6216\u8005\u00a0next\u00a0\u7684\u5e73\u884c\u5206\u652f\uff0c\u88ab\u7528\u6765\u505a\u540e\u7eed\u5f00\u53d1\u6216\u8005\u6d4b\u8bd5\u7a33\u5b9a\u6027\u2014\u2014\u8fd9\u4e9b\u5206\u652f\u4e0d\u5fc5\u4fdd\u6301\u7edd\u5bf9\u7a33\u5b9a\uff0c\u4f46\u662f\u4e00\u65e6\u8fbe\u5230\u7a33\u5b9a\u72b6\u6001\uff0c\u5b83\u4eec\u5c31\u53ef\u4ee5\u88ab\u5408\u5e76\u5165\u00a0master\u00a0\u5206\u652f\u4e86\u3002 \u8fd9\u6837\uff0c\u5728\u786e\u4fdd\u8fd9\u4e9b\u5df2\u5b8c\u6210\u7684\u7279\u6027\u5206\u652f\uff08\u77ed\u671f\u5206\u652f\uff0c\u6bd4\u5982\u4e4b\u524d\u7684\u00a0iss53\u00a0\u5206\u652f\uff09\u80fd\u591f\u901a\u8fc7\u6240\u6709\u6d4b\u8bd5\uff0c\u5e76\u4e14\u4e0d\u4f1a\u5f15\u5165\u66f4\u591a bug \u4e4b\u540e\uff0c\u5c31\u53ef\u4ee5\u5408\u5e76\u5165\u4e3b\u5e72\u5206\u652f\u4e2d\uff0c\u7b49\u5f85\u4e0b\u4e00\u6b21\u7684\u53d1\u5e03\u3002<\/p>\n
\u4e8b\u5b9e\u4e0a\u6211\u4eec\u521a\u624d\u8ba8\u8bba\u7684\uff0c\u662f\u968f\u7740\u4f60\u7684\u63d0\u4ea4\u800c\u4e0d\u65ad\u53f3\u79fb\u7684\u6307\u9488\u3002 \u7a33\u5b9a\u5206\u652f\u7684\u6307\u9488\u603b\u662f\u5728\u63d0\u4ea4\u5386\u53f2\u4e2d\u843d\u540e\u4e00\u5927\u622a\uff0c\u800c\u524d\u6cbf\u5206\u652f\u7684\u6307\u9488\u5f80\u5f80\u6bd4\u8f83\u9760\u524d\u3002<\/p>\n
$\"\u6e10\u8fdb\u7a33\u5b9a\u5206\u652f\u7684\u7ebf\u6027\u56fe\u3002\"$ <\/p>\n
Figure 3-18.\u00a0\u6e10\u8fdb\u7a33\u5b9a\u5206\u652f\u7684\u7ebf\u6027\u56fe\u901a\u5e38\u628a\u4ed6\u4eec\u60f3\u8c61\u6210\u6d41\u6c34\u7ebf\uff08work silos\uff09\u53ef\u80fd\u66f4\u597d\u7406\u89e3\u4e00\u70b9\uff0c\u90a3\u4e9b\u7ecf\u8fc7\u6d4b\u8bd5\u8003\u9a8c\u7684\u63d0\u4ea4\u4f1a\u88ab\u9074\u9009\u5230\u66f4\u52a0\u7a33\u5b9a\u7684\u6d41\u6c34\u7ebf\u4e0a\u53bb\u3002<\/p>\n
$\"\u6e10\u8fdb\u7a33\u5b9a\u5206\u652f\u7684\u5de5\u4f5c\u6d41\uff08silo\uff09\u89c6\u56fe\u3002\"$ <\/p>\n
Figure 3-19.\u00a0\u6e10\u8fdb\u7a33\u5b9a\u5206\u652f\u7684\u6d41\u6c34\u7ebf\uff08\u201csilo\u201d\uff09\u89c6\u56fe\u4f60\u53ef\u4ee5\u7528\u8fd9\u79cd\u65b9\u6cd5\u7ef4\u62a4\u4e0d\u540c\u5c42\u6b21\u7684\u7a33\u5b9a\u6027\u3002 \u4e00\u4e9b\u5927\u578b\u9879\u76ee\u8fd8\u6709\u4e00\u4e2a\u00a0proposed\uff08\u5efa\u8bae\uff09 \u6216\u00a0pu: proposed updates\uff08\u5efa\u8bae\u66f4\u65b0\uff09\u5206\u652f\uff0c\u5b83\u53ef\u80fd\u56e0\u5305\u542b\u4e00\u4e9b\u4e0d\u6210\u719f\u7684\u5185\u5bb9\u800c\u4e0d\u80fd\u8fdb\u5165\u00a0next\u00a0\u6216\u8005\u00a0master\u5206\u652f\u3002 \u8fd9\u4e48\u505a\u7684\u76ee\u7684\u662f\u4f7f\u4f60\u7684\u5206\u652f\u5177\u6709\u4e0d\u540c\u7ea7\u522b\u7684\u7a33\u5b9a\u6027\uff1b\u5f53\u5b83\u4eec\u5177\u6709\u4e00\u5b9a\u7a0b\u5ea6\u7684\u7a33\u5b9a\u6027\u540e\uff0c\u518d\u628a\u5b83\u4eec\u5408\u5e76\u5165\u5177\u6709\u66f4\u9ad8\u7ea7\u522b\u7a33\u5b9a\u6027\u7684\u5206\u652f\u4e2d\u3002 \u518d\u6b21\u5f3a\u8c03\u4e00\u4e0b\uff0c\u4f7f\u7528\u591a\u4e2a\u957f\u671f\u5206\u652f\u7684\u65b9\u6cd5\u5e76\u975e\u5fc5\u8981\uff0c\u4f46\u662f\u8fd9\u4e48\u505a\u901a\u5e38\u5f88\u6709\u5e2e\u52a9\uff0c\u5c24\u5176\u662f\u5f53\u4f60\u5728\u4e00\u4e2a\u975e\u5e38\u5e9e\u5927\u6216\u8005\u590d\u6742\u7684\u9879\u76ee\u4e2d\u5de5\u4f5c\u65f6\u3002<\/p>\n
\u7279\u6027\u5206\u652f<\/strong><\/span><\/div>\n<\/a>\u7279\u6027\u5206\u652f\u5bf9\u4efb\u4f55\u89c4\u6a21\u7684\u9879\u76ee\u90fd\u9002\u7528\u3002 \u7279\u6027\u5206\u652f\u662f\u4e00\u79cd\u77ed\u671f\u5206\u652f\uff0c\u5b83\u88ab\u7528\u6765\u5b9e\u73b0\u5355\u4e00\u7279\u6027\u6216\u5176\u76f8\u5173\u5de5\u4f5c\u3002 \u4e5f\u8bb8\u4f60\u4ece\u6765\u6ca1\u6709\u5728\u5176\u4ed6\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff08VCS\uff09\u4e0a\u8fd9\u4e48\u505a\u8fc7\uff0c\u56e0\u4e3a\u5728\u90a3\u4e9b\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u4e2d\u521b\u5efa\u548c\u5408\u5e76\u5206\u652f\u901a\u5e38\u5f88\u8d39\u52b2\u3002 \u7136\u800c\uff0c\u5728 Git \u4e2d\u4e00\u5929\u4e4b\u5185\u591a\u6b21\u521b\u5efa\u3001\u4f7f\u7528\u3001\u5408\u5e76\u3001\u5220\u9664\u5206\u652f\u90fd\u5f88\u5e38\u89c1\u3002<\/p>\n
\u4f60\u5df2\u7ecf\u5728\u4e0a\u4e00\u8282\u4e2d\u4f60\u521b\u5efa\u7684\u00a0iss53\u00a0\u548c\u00a0hotfix\u00a0\u7279\u6027\u5206\u652f\u4e2d\u770b\u5230\u8fc7\u8fd9\u79cd\u7528\u6cd5\u3002 \u4f60\u5728\u4e0a\u4e00\u8282\u7528\u5230\u7684\u7279\u6027\u5206\u652f\uff08iss53\u00a0\u548c\u00a0hotfix\u00a0\u5206\u652f\uff09\u4e2d\u63d0\u4ea4\u4e86\u4e00\u4e9b\u66f4\u65b0\uff0c\u5e76\u4e14\u5728\u5b83\u4eec\u5408\u5e76\u5165\u4e3b\u5e72\u5206\u652f\u4e4b\u540e\uff0c\u4f60\u53c8\u5220\u9664\u4e86\u5b83\u4eec\u3002 \u8fd9\u9879\u6280\u672f\u80fd\u4f7f\u4f60\u5feb\u901f\u5e76\u4e14\u5b8c\u6574\u5730\u8fdb\u884c\u4e0a\u4e0b\u6587\u5207\u6362\uff08context-switch\uff09\u2014\u2014\u56e0\u4e3a\u4f60\u7684\u5de5\u4f5c\u88ab\u5206\u6563\u5230\u4e0d\u540c\u7684\u6d41\u6c34\u7ebf\u4e2d\uff0c\u5728\u4e0d\u540c\u7684\u6d41\u6c34\u7ebf\u4e2d\u6bcf\u4e2a\u5206\u652f\u90fd\u4ec5\u4e0e\u5176\u76ee\u6807\u7279\u6027\u76f8\u5173\uff0c\u56e0\u6b64\uff0c\u5728\u505a\u4ee3\u7801\u5ba1\u67e5\u4e4b\u7c7b\u7684\u5de5\u4f5c\u7684\u65f6\u5019\u5c31\u80fd\u66f4\u52a0\u5bb9\u6613\u5730\u770b\u51fa\u4f60\u505a\u4e86\u54ea\u4e9b\u6539\u52a8\u3002 \u4f60\u53ef\u4ee5\u628a\u505a\u51fa\u7684\u6539\u52a8\u5728\u7279\u6027\u5206\u652f\u4e2d\u4fdd\u7559\u51e0\u5206\u949f\u3001\u51e0\u5929\u751a\u81f3\u51e0\u4e2a\u6708\uff0c\u7b49\u5b83\u4eec\u6210\u719f\u4e4b\u540e\u518d\u5408\u5e76\uff0c\u800c\u4e0d\u7528\u5728\u4e4e\u5b83\u4eec\u5efa\u7acb\u7684\u987a\u5e8f\u6216\u5de5\u4f5c\u8fdb\u5ea6\u3002<\/p>\n
\u8003\u8651\u8fd9\u6837\u4e00\u4e2a\u4f8b\u5b50\uff0c\u4f60\u5728\u00a0master\u00a0\u5206\u652f\u4e0a\u5de5\u4f5c\u5230\u00a0C1\uff0c\u8fd9\u65f6\u4e3a\u4e86\u89e3\u51b3\u4e00\u4e2a\u95ee\u9898\u800c\u65b0\u5efa\u00a0iss91\u00a0\u5206\u652f\uff0c\u5728iss91\u00a0\u5206\u652f\u4e0a\u5de5\u4f5c\u5230\u00a0C4\uff0c\u7136\u800c\u5bf9\u4e8e\u90a3\u4e2a\u95ee\u9898\u4f60\u53c8\u6709\u4e86\u65b0\u7684\u60f3\u6cd5\uff0c\u4e8e\u662f\u4f60\u518d\u65b0\u5efa\u4e00\u4e2a\u00a0iss91v2\u00a0\u5206\u652f\u8bd5\u56fe\u7528\u53e6\u4e00\u79cd\u65b9\u6cd5\u89e3\u51b3\u90a3\u4e2a\u95ee\u9898\uff0c\u63a5\u7740\u4f60\u56de\u5230\u00a0master\u00a0\u5206\u652f\u5de5\u4f5c\u4e86\u4e00\u4f1a\u513f\uff0c\u4f60\u53c8\u5192\u51fa\u4e86\u4e00\u4e2a\u4e0d\u592a\u786e\u5b9a\u7684\u60f3\u6cd5\uff0c\u4f60\u4fbf\u5728\u00a0C10\u00a0\u7684\u65f6\u5019\u65b0\u5efa\u4e00\u4e2a\u00a0dumbidea\u00a0\u5206\u652f\uff0c\u5e76\u5728\u4e0a\u9762\u505a\u4e9b\u5b9e\u9a8c\u3002 \u4f60\u7684\u63d0\u4ea4\u5386\u53f2\u770b\u8d77\u6765\u50cf\u4e0b\u9762\u8fd9\u4e2a\u6837\u5b50\uff1a<\/p>\n
$\"\u62e5\u6709\u591a\u4e2a\u7279\u6027\u5206\u652f\u7684\u63d0\u4ea4\u5386\u53f2\u3002\"$ <\/p>\n
Figure 3-20.\u00a0\u62e5\u6709\u591a\u4e2a\u7279\u6027\u5206\u652f\u7684\u63d0\u4ea4\u5386\u53f2\u73b0\u5728\uff0c\u6211\u4eec\u5047\u8bbe\u4e24\u4ef6\u4e8b\u60c5\uff1a\u4f60\u51b3\u5b9a\u4f7f\u7528\u7b2c\u4e8c\u4e2a\u65b9\u6848\u6765\u89e3\u51b3\u90a3\u4e2a\u95ee\u9898\uff0c\u5373\u4f7f\u7528\u5728\u00a0iss91v2\u00a0\u5206\u652f\u4e2d\u65b9\u6848\uff1b\u53e6\u5916\uff0c\u4f60\u5c06\u00a0dumbidea\u00a0\u5206\u652f\u62ff\u7ed9\u4f60\u7684\u540c\u4e8b\u770b\u8fc7\u4e4b\u540e\uff0c\u7ed3\u679c\u53d1\u73b0\u8fd9\u662f\u4e2a\u60ca\u4eba\u4e4b\u4e3e\u3002 \u8fd9\u65f6\u4f60\u53ef\u4ee5\u629b\u5f03\u00a0iss91\u5206\u652f\uff08\u5373\u4e22\u5f03\u00a0C5\u00a0\u548c\u00a0C6\u00a0\u63d0\u4ea4\uff09\uff0c\u7136\u540e\u628a\u53e6\u5916\u4e24\u4e2a\u5206\u652f\u5408\u5e76\u5165\u4e3b\u5e72\u5206\u652f\u3002 \u6700\u7ec8\u4f60\u7684\u63d0\u4ea4\u5386\u53f2\u770b\u8d77\u6765\u50cf\u4e0b\u9762\u8fd9\u4e2a\u6837\u5b50\uff1a<\/p>\n
$\"\u5408\u5e76\u4e86$ <\/p>\n
Figure 3-21.\u00a0\u5408\u5e76\u4e86\u00a0dumbidea\u00a0\u548c\u00a0iss91v2\u00a0\u5206\u652f\u4e4b\u540e\u7684\u63d0\u4ea4\u5386\u53f2\u6211\u4eec\u5c06\u4f1a\u5728\u00a0 \u5206\u5e03\u5f0f Git<\/a>\u00a0\u4e2d\u5411\u4f60\u63ed\u793a\u66f4\u591a\u6709\u5173\u5206\u652f\u5de5\u4f5c\u6d41\u7684\u7ec6\u8282\uff0c\u56e0\u6b64\uff0c\u8bf7\u786e\u4fdd\u4f60\u9605\u8bfb\u5b8c\u90a3\u4e2a\u7ae0\u8282\u4e4b\u540e\uff0c\u518d\u6765\u51b3\u5b9a\u4f60\u7684\u4e0b\u4e2a\u9879\u76ee\u8981\u4f7f\u7528\u4ec0\u4e48\u6837\u7684\u5206\u652f\u7b56\u7565\uff08branching scheme\uff09\u3002<\/p>\n
\u8bf7\u7262\u8bb0\uff0c\u5f53\u4f60\u505a\u8fd9\u4e48\u591a\u64cd\u4f5c\u7684\u65f6\u5019\uff0c\u8fd9\u4e9b\u5206\u652f\u5168\u90e8\u90fd\u5b58\u4e8e\u672c\u5730\u3002 \u5f53\u4f60\u65b0\u5efa\u548c\u5408\u5e76\u5206\u652f\u7684\u65f6\u5019\uff0c\u6240\u6709\u8fd9\u4e00\u5207\u90fd\u53ea\u53d1\u751f\u5728\u4f60\u672c\u5730\u7684 Git \u7248\u672c\u5e93\u4e2d \u2014\u2014 \u6ca1\u6709\u4e0e\u670d\u52a1\u5668\u53d1\u751f\u4ea4\u4e92\u3002<\/p>\n
\n
\u539f\u6587\u6765\u81ea\uff1a http:\/\/blog.csdn.net\/wh211212\/blog\/column<\/a><\/p>\n
\u672c\u6587\u5730\u5740\uff1a http:\/\/lrxjmw.cn\/git-branch-history-today.html \u200e<\/a>\u7f16\u8f91\uff1a\u738b\u8f89\uff0c\u5ba1\u6838\u5458\uff1a\u5cb3\u6c38<\/span><\/p>\n<\/blockquote>\n","protected":false},"excerpt":{"rendered":"
\u5bfc\u8bfb \u51e0\u4e4e\u6240\u6709\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u90fd\u4ee5\u67d0\u79cd\u5f62\u5f0f\u652f\u6301\u5206\u652f\u3002 \u4f7f\u7528\u5206\u652f\u610f\u5473\u7740\u4f60\u53ef\u4ee5\u628a\u4f60\u7684\u5de5\u4f5c\u4ece\u5f00\u53d1\u4e3b\u7ebf\u4e0a\u5206\u79bb\u5f00\u6765\uff0c\u4ee5\u514d\u5f71 […]<\/p>\n","protected":false},"author":63,"featured_media":37258,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[55],"tags":[],"class_list":["post-35619","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-thread"],"acf":[],"_links":{"self":[{"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/posts\/35619","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/users\/63"}],"replies":[{"embeddable":true,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/comments?post=35619"}],"version-history":[{"count":11,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/posts\/35619\/revisions"}],"predecessor-version":[{"id":262632,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/posts\/35619\/revisions\/262632"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/media\/37258"}],"wp:attachment":[{"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/media?parent=35619"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/categories?post=35619"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/tags?post=35619"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}