{"id":6704,"date":"2012-07-21T01:54:29","date_gmt":"2012-07-20T17:54:29","guid":{"rendered":"http:\/\/ihower.tw\/blog\/?p=6704"},"modified":"2020-07-27T20:04:09","modified_gmt":"2020-07-27T12:04:09","slug":"git-rebase-%e5%92%8c-merge-%e5%90%88%e4%bd%b5%e6%93%8d%e4%bd%9c%e7%a4%ba%e7%af%84%e9%8c%84%e5%bd%b1","status":"publish","type":"post","link":"https:\/\/ihower.tw\/blog\/6704-git-rebase-%e5%92%8c-merge-%e5%90%88%e4%bd%b5%e6%93%8d%e4%bd%9c%e7%a4%ba%e7%af%84%e9%8c%84%e5%bd%b1","title":{"rendered":"Git rebase \u548c merge \u5408\u4f75\u64cd\u4f5c\u793a\u7bc4\u9304\u5f71"},"content":{"rendered":"<p>\u6628\u5929\u7684 <a href=\"\/blog\/archives\/6696\/\">Git \u6559\u5b78\u6295\u5f71\u7247<\/a> \u9084\u883b\u591a\u4eba\u6309\u8d0a\u5206\u4eab\u7684\uff0c\u8b1d\u8b1d\u5927\u5bb6\u3002\u4e0d\u904e\u5176\u4e2d\u5c11\u4e86\u91cd\u8981\u7684 live demo \u89ba\u5f97\u6709\u9ede\u53ef\u60dc\uff0c\u6240\u4ee5\u4f86\u628a\u5176\u4e2d\u6700\u6709\u8da3\u7684\u4e00\u6bb5\u9304\u4e0b\u4f86\u597d\u4e86\u3002\u7b2c\u4e00\u6b21\u9304\u5f71\u52a0\u8072\u97f3\u767c\u73fe\u9084\u883b\u7dca\u5f35\u7684\uff0c\u737b\u919c\u54e9\u3002<\/p>\n<p>\u9019\u662f\u5148\u7528 rebase \u6574\u7406 commit history (\u5305\u62ec\u4fee\u6539\u8a0a\u606f\u3001\u4fee\u6539\u5167\u5bb9\u3001\u522a\u9664\u3001\u62c6\u958b\u3001\u65b0\u589e\u548c\u8abf\u63dbcommit\u9806\u5e8f)\uff0c\u7136\u5f8c\u518d\u9032\u884c merge \u7684\u793a\u7bc4\u3002\u4f46\u8aa0\u5982\u6211\u6295\u5f71\u7247 p117~p118 \u6240\u8aaa\uff0c\u9019\u662f\u4e00\u7a2e<del>\u8ffd\u6c42\u5b8c\u7f8e<\/del>\u6f54\u7656\u9f9c\u6bdb\u7684\u4f5c\u6cd5\uff0c\u4f46\u662f\u770b\u5230\u6700\u5f8c\u7684 commits \u7dda\u5716\u9019\u9ebc\u6f02\u4eae\uff0c\u5c31\u89ba\u5f97\u503c\u5f97\u5566\uff0c\u800c\u4e14\u4e2d\u9593\u7684\u904e\u7a0b\u5f88\u6709\u8da3\u4e0d\u662f\u55ce? XD (\u9664\u975e\u4e00\u76f4\u767c\u751f rebase conflict \u60c5\u6cc1\u5566\uff0c\u90a3\u5c31\u4e0d\u597d\u73a9\u4e86\uff0c\u8acb\u91cf\u529b\u800c\u70ba :p)<\/p>\n<p><iframe loading=\"lazy\" src=\"https:\/\/www.youtube.com\/embed\/MAV1HCsp7cs\" width=\"420\" height=\"315\" frameborder=\"0\" allowfullscreen=\"allowfullscreen\"><\/iframe><\/p>\n<p>\u60c5\u5883\u662f\u6211\u5011\u60f3\u628a feature\/forum \u9019\u500b branch \u5408\u4f75\u9032\u4e3b\u5e79 master\uff0c\u9019\u662f\u5408\u4f75\u524d\uff1a<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" data-attachment-id=\"6750\" data-permalink=\"https:\/\/ihower.tw\/blog\/6704-git-rebase-%e5%92%8c-merge-%e5%90%88%e4%bd%b5%e6%93%8d%e4%bd%9c%e7%a4%ba%e7%af%84%e9%8c%84%e5%bd%b1\/before-merge\" data-orig-file=\"https:\/\/ihower.tw\/blog\/wp-content\/uploads\/2012\/07\/before-merge.png\" data-orig-size=\"381,438\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;}\" data-image-title=\"before-merge\" data-image-description=\"\" data-image-caption=\"\" data-medium-file=\"https:\/\/ihower.tw\/blog\/wp-content\/uploads\/2012\/07\/before-merge.png\" data-large-file=\"https:\/\/ihower.tw\/blog\/wp-content\/uploads\/2012\/07\/before-merge.png\" class=\"alignnone size-full wp-image-6750\" title=\"before-merge\" src=\"http:\/\/ihower.tw\/blog\/wp-content\/uploads\/2012\/07\/before-merge.png\" alt=\"\" width=\"381\" height=\"438\" \/><\/p>\n<p>\u4ee5\u4e0b\u662f\u76f4\u63a5\u5728 master branch \u505a merge feature\/forum \u7684\u5408\u4f75\u7d50\u679c\u3002\u4f60\u6703\u767c\u73fe feature\/forum \u8207 feature\/chatroom \u9019\u5169\u500b\u5206\u652f\u51fa\u73fe\u4ea4\u758a\u7684\u60c5\u6cc1\uff0c\u7576\u5408\u4f75\u7684\u5206\u652f\u4e00\u591a\uff0c\u7dda\u5716\u5c31\u5bb9\u6613\u8b8a\u5f97\u96dc\u4e82\uff1a<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" data-attachment-id=\"6751\" data-permalink=\"https:\/\/ihower.tw\/blog\/6704-git-rebase-%e5%92%8c-merge-%e5%90%88%e4%bd%b5%e6%93%8d%e4%bd%9c%e7%a4%ba%e7%af%84%e9%8c%84%e5%bd%b1\/normal-merge\" data-orig-file=\"https:\/\/ihower.tw\/blog\/wp-content\/uploads\/2012\/07\/normal-merge.png\" data-orig-size=\"350,455\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;}\" data-image-title=\"normal-merge\" data-image-description=\"\" data-image-caption=\"\" data-medium-file=\"https:\/\/ihower.tw\/blog\/wp-content\/uploads\/2012\/07\/normal-merge.png\" data-large-file=\"https:\/\/ihower.tw\/blog\/wp-content\/uploads\/2012\/07\/normal-merge.png\" class=\"alignnone size-full wp-image-6751\" title=\"normal-merge\" src=\"http:\/\/ihower.tw\/blog\/wp-content\/uploads\/2012\/07\/normal-merge.png\" alt=\"\" width=\"350\" height=\"455\" \/><\/p>\n<p>\u4ee5\u4e0b\u662f\u6539\u6210\u7528 rebase \u6574\u7406\u4e4b\u5f8c\u518d merge \u7684\u65b9\u5f0f\uff0c\u505a\u51fa\u6f02\u4eae\u7684\u5408\u4f75\u7dda\u5716\uff1a<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" data-attachment-id=\"6752\" data-permalink=\"https:\/\/ihower.tw\/blog\/6704-git-rebase-%e5%92%8c-merge-%e5%90%88%e4%bd%b5%e6%93%8d%e4%bd%9c%e7%a4%ba%e7%af%84%e9%8c%84%e5%bd%b1\/rebase-merge\" data-orig-file=\"https:\/\/ihower.tw\/blog\/wp-content\/uploads\/2012\/07\/rebase-merge.png\" data-orig-size=\"343,462\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;}\" data-image-title=\"rebase-merge\" data-image-description=\"\" data-image-caption=\"\" data-medium-file=\"https:\/\/ihower.tw\/blog\/wp-content\/uploads\/2012\/07\/rebase-merge.png\" data-large-file=\"https:\/\/ihower.tw\/blog\/wp-content\/uploads\/2012\/07\/rebase-merge.png\" class=\"alignnone size-full wp-image-6752\" title=\"rebase-merge\" src=\"http:\/\/ihower.tw\/blog\/wp-content\/uploads\/2012\/07\/rebase-merge.png\" alt=\"\" width=\"343\" height=\"462\" \/><\/p>\n<p>ps. \u5982\u679c\u6709\u4eba\u60f3\u7df4\u7fd2\u7684\u8a71\uff0c\u53ef\u4ee5 fork <a href=\"https:\/\/github.com\/ihower\/sandbox\">sandbox<\/a> \u9019\u500b\u5c08\u6848(\u7d14\u7cb9\u7df4\u7fd2git\uff0c\u662f\u500b\u4e82\u5beb\u7684rails\u5c08\u6848)\u3002<\/p>\n<p>ps. rebase \u4e5f\u53ef\u4ee5\u53c3\u8003\u9d28\u4e03\u7684<a href=\"https:\/\/blog.yorkxin.org\/2011\/07\/29\/git-rebase.html\">\u9019\u7bc7\u6587\u7ae0<\/a><\/p>\n\n\n<p><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u6628\u5929\u7684 Git \u6559\u5b78\u6295\u5f71\u7247 \u9084\u883b\u591a\u4eba\u6309\u8d0a\u5206\u4eab\u7684\uff0c\u8b1d\u8b1d\u5927\u5bb6\u3002\u4e0d\u904e\u5176\u4e2d\u5c11\u4e86\u91cd\u8981\u7684 live demo \u89ba\u5f97\u6709\u9ede\u53ef\u60dc &hellip; <\/p>\n<p class=\"link-more\"><a href=\"https:\/\/ihower.tw\/blog\/6704-git-rebase-%e5%92%8c-merge-%e5%90%88%e4%bd%b5%e6%93%8d%e4%bd%9c%e7%a4%ba%e7%af%84%e9%8c%84%e5%bd%b1\" class=\"more-link\">\u95b1\u8b80\u5168\u6587<span class=\"screen-reader-text\">\u3008Git rebase \u548c merge \u5408\u4f75\u64cd\u4f5c\u793a\u7bc4\u9304\u5f71\u3009<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_monsterinsights_skip_tracking":false,"_monsterinsights_sitenote_active":false,"_monsterinsights_sitenote_note":"","_monsterinsights_sitenote_category":0,"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":false,"jetpack_social_options":{"image_generator_settings":{"template":"highway","default_image_id":0,"font":"","enabled":false},"version":2}},"categories":[48],"tags":[],"class_list":["post-6704","post","type-post","status-publish","format-standard","hentry","category-git","entry"],"jetpack_publicize_connections":[],"jetpack_featured_media_url":"","jetpack_shortlink":"https:\/\/wp.me\/p1q6tG-1K8","jetpack_sharing_enabled":true,"jetpack_likes_enabled":true,"_links":{"self":[{"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/posts\/6704","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/comments?post=6704"}],"version-history":[{"count":43,"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/posts\/6704\/revisions"}],"predecessor-version":[{"id":10536,"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/posts\/6704\/revisions\/10536"}],"wp:attachment":[{"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/media?parent=6704"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/categories?post=6704"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/ihower.tw\/blog\/wp-json\/wp\/v2\/tags?post=6704"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}