<\/p>\n
\u25c6 \u5be6\u4f5c\u7df4\u7fd2\uff1a\u5728\u4e0d\u540c\u5206\u652f\u4e0a\u5efa\u7acb\u6a94\u6848<\/span><\/p>\n <\/p>\n \u6211\u5011\u5148\u5728 master \u652f\u7dda\u5efa\u7acb\u4e00\u500b\u6a94\u6848 \u201cmaster-only\u201d\u3002<\/p>\n <\/p>\n <\/p>\n <\/p>\n \u7136\u5f8c\u5728 new-feature \u652f\u7dda\u5efa\u7acb\u4e00\u500b\u6a94\u6848 \u201cnew-feature-only\u301e\uff0c\u4e26\u5206\u5225\u63a8\u4e0a\u4e0d\u540c\u7684\u5206\u652f\u3002<\/p>\n <\/p>\n <\/p>\n <\/p>\n <\/p>\n \u63a5\u4e0b\u4f86\uff0c\u6211\u5011\u518d\u5207\u63db\u56de master \u5206\u652f\uff0c\u4f86\u67e5\u770b\u4e00\u4e0b\u00a0master \u8207 new-feature \u5169\u500b\u5206\u652f\u7684\u5dee\u7570\u6027<\/p>\n <\/p>\n <\/p>\n <\/p>\n <\/p>\n \u6211\u5011\u5148\u4f86\u770b\u770b\u76ee\u524d\u7684\u5206\u652f\u548c\u6a94\u6848 ( \u5728 master \u5206\u652f\u4e0a\u61c9\u8a72\u53ea\u6709 master-only.txt \u00a0\uff0c\u4e0d\u6703\u6709 new-feature-only.txt \u6a94\u6848 )<\/p>\n <\/p>\n <\/p>\n <\/p>\n <\/p>\n \u6211\u5011\u518d\u4f86\u770b\u4e00\u4e0b git log<\/span> \u8a18\u9304\uff0c\u9019\u6642\u5019\u5728 master \u5206\u652f\u4e0a\u61c9\u8a72\u4e0d\u6703\u6709 new-feature \u7684 commit \u8a18\u9304<\/p>\n <\/p>\n <\/p>\n <\/p>\n <\/p>\n <\/p>\n <\/p>\n \u25c6 \u5be6\u4f5c\u7df4\u7fd2\uff1a\u5408\u4f75<\/span><\/p>\n \u200c<\/p>\n \u6211\u5011\u63a5\u4e0b\u4f86\u9032\u884c merge \u6307\u4ee4\u4f86\u9032\u884c\u5408\u4f75\uff0c\u9032\u884c\u5408\u4f75\u7684\u6642\u5019\uff0c\u4e5f\u662f\u9700\u8981\u985e\u4f3c Commit \u4e00\u6a23\uff0c\u9700\u8981\u586b\u5beb\u5408\u4f75\u8a0a\u606f\u3002<\/p>\n \u5b8c\u6210\u4e4b\u5f8c\uff0c\u6211\u5011\u5148\u4f86\u770b\u770b\u6a94\u6848\u4e0a\u7684\u8b8a\u5316\uff0cnew-feature-only.txt \u6a94\u6848\u5df2\u7d93\u51fa\u73fe\u4e86\u3002<\/p>\n <\/p>\n <\/p>\n \u200c<\/p>\n \u9019\u6642\u5019\u6211\u5011\u7528 git log \u4f86\u770b\u4e00\u4e0b\u5167\u5bb9\u4e0a\u7684\u8b8a\u5316<\/p>\n <\/p>\n <\/p>\n <\/p>\n <\/p>\n \u5df2\u7d93\u5c07 new-feature \u7684 Commit \u8b8a\u52d5\u5167\u5bb9\u4e5f\u52a0\u5165<\/p>\n \u200c<\/p>\n <\/p>\n","protected":false},"excerpt":{"rendered":" \u6628\u5929\u8b1b\u5230\u4e86 Git Branch\uff0c\u6709\u4e86\u5206\u652f\uff0c\u5c31\u6703\u6709\u9700\u8981\u5408\u4f75\u7684\u6642\u5019\uff0c\u6240\u4ee5\u6211\u5011\u4eca\u5929\u4f86\u8b1b\u8b1b\u5982\u4f55\u9032\u884c\u5408\u4f75\u3002 \u4e00\u6a23\uff0c\u6211\u5011\u900f\u904e\u5be6\u4f5c\u4f86\u7df4\u7fd2\u5b78\u7fd2\u3002 \u25a0\u00a0Git Merge \u25c6 \u5be6\u4f5c\u7df4\u7fd2\uff1a\u5728\u4e0d\u540c\u5206\u652f\u4e0a\u5efa\u7acb\u6a94\u6848 \u6211\u5011\u5148\u5728 master \u652f\u7dda\u5efa\u7acb\u4e00\u500b\u6a94\u6848 \u201cmaster-only\u201d\u3002 git checkout master —- Switched to branch ‘master’ Your branch is up to da […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"jetpack_post_was_ever_published":false,"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":false,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_memberships_contains_paid_content":false,"footnotes":"","jetpack_publicize_message":"","jetpack_publicize_feature_enabled":true,"jetpack_social_post_already_shared":true,"jetpack_social_options":{"image_generator_settings":{"template":"highway","enabled":false}}},"categories":[3,251],"tags":[307,305,273],"jetpack_publicize_connections":[],"jetpack_featured_media_url":"","jetpack_sharing_enabled":true,"jetpack_shortlink":"https:\/\/wp.me\/p6rhcT-fM","jetpack-related-posts":[],"jetpack_likes_enabled":false,"_links":{"self":[{"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/posts\/978"}],"collection":[{"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/comments?post=978"}],"version-history":[{"count":2,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/posts\/978\/revisions"}],"predecessor-version":[{"id":980,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/posts\/978\/revisions\/980"}],"wp:attachment":[{"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/media?parent=978"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/categories?post=978"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/tags?post=978"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}git checkout master\r\n\r\n----\r\n\r\nSwitched to branch 'master'\r\n\r\nYour branch is up to date with 'origin\/master\u2019.\r\n\r\n----\r\n\r\ntouch master-only.txt\r\n\r\ngit add *\r\n\r\ngit commit -m\u00a0\"master-only\"<\/pre>\n
git checkout new-feature\r\n\r\n----\r\n\r\nSwitched to branch 'new-feature'\r\n\r\n----\r\n\r\ntouch\u00a0new-feature-only.txt\r\n\r\ngit add *\r\n\r\ngit commit -m\u00a0\"new-feature-only\"<\/pre>\n
git diff new-feature<\/pre>\n
<\/p>\n
ls<\/pre>\n
<\/p>\n
git log<\/pre>\n
<\/p>\n
git merge new-feature\r\n\r\nls<\/pre>\n
<\/p>\n
git log<\/pre>\n
<\/p>\n