{"id":1459,"date":"2012-04-20T21:54:19","date_gmt":"2012-04-20T13:54:19","guid":{"rendered":"http:\/\/doophp.sinaapp.com\/?p=1459"},"modified":"2012-04-20T21:54:19","modified_gmt":"2012-04-20T13:54:19","slug":"branches-options-with-tortoisegit","status":"publish","type":"post","link":"https:\/\/blog.vimge.com\/archives\/other\/branches-options-with-tortoisegit.html","title":{"rendered":"\u4f7f\u7528TortoiseGit\u5bf9Git\u7248\u672c\u8fdb\u884c\u5206\u652f\u64cd\u4f5c"},"content":{"rendered":"<p><strong>\u7248\u672c\u514b\u9686\u5206\u652f\u95ee\u9898<\/strong><\/p>\n<p>TortoiseGit\u5728\u514b\u9686\u5206\u652f\u7684\u65f6\u5019\uff0c\u9ed8\u8ba4\u514b\u9686master\u5206\u652f\uff0c\u514b\u9686\u540e\u672c\u5730\u5de5\u4f5c\u76ee\u5f55\u4e3a\u4e2d\u5fc3\u5668\u7684Master\u5206\u652f.<\/p>\n<p><a href=\"http:\/\/doophp.sinaapp.com\/archives\/other\/branches-options-with-tortoisegit.html\/attachment\/1-4\" rel=\"attachment wp-att-1467\"><img loading=\"lazy\" class=\"alignnone size-full wp-image-1467\" title=\"1\" src=\"http:\/\/doophp-wordpress.stor.sinaapp.com\/uploads\/2012\/04\/11.jpg\" alt=\"\" width=\"543\" height=\"373\" srcset=\"https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/11.jpg 543w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/11-150x103.jpg 150w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/11-300x206.jpg 300w\" sizes=\"(max-width: 543px) 100vw, 543px\" \/><!--more--><\/a><\/p>\n<p>\u514b\u9686\u540e\u672c\u5730\u5206\u652f<\/p>\n<p><a href=\"http:\/\/doophp.sinaapp.com\/archives\/other\/branches-options-with-tortoisegit.html\/attachment\/2-2\" rel=\"attachment wp-att-1468\"><img loading=\"lazy\" class=\"alignnone size-full wp-image-1468\" title=\"2\" src=\"http:\/\/doophp-wordpress.stor.sinaapp.com\/uploads\/2012\/04\/21.jpg\" alt=\"\" width=\"469\" height=\"256\" srcset=\"https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/21.jpg 469w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/21-150x81.jpg 150w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/21-300x163.jpg 300w\" sizes=\"(max-width: 469px) 100vw, 469px\" \/><br \/>\n<\/a><\/p>\n<p>\u4e2d\u5fc3\u5e93\u5206\u652f<\/p>\n<p><a href=\"http:\/\/doophp.sinaapp.com\/archives\/other\/branches-options-with-tortoisegit.html\/attachment\/3-2\" rel=\"attachment wp-att-1469\"><img loading=\"lazy\" class=\"alignnone size-full wp-image-1469\" title=\"3\" src=\"http:\/\/doophp-wordpress.stor.sinaapp.com\/uploads\/2012\/04\/31.jpg\" alt=\"\" width=\"415\" height=\"191\" srcset=\"https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/31.jpg 415w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/31-150x69.jpg 150w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/31-300x138.jpg 300w\" sizes=\"(max-width: 415px) 100vw, 415px\" \/><\/a><\/p>\n<p><strong>Push\u5206\u652f\u5230\u4e2d\u5fc3\u670d\u52a1\u5668\uff08Pushing the local branch to a new remote branch\uff09<\/strong><\/p>\n<p>Git\u5728\u672c\u5730\u521b\u5efa\u5206\u652f\u540e\uff0c\u5982\u679c\u6211\u4eec\u9700\u8981\u548c\u56e2\u961f\u5176\u4ed6\u6210\u5458\u505a\u4ee3\u7801\u4ea4\u6d41\u65f6\u5c31\u9700\u8981\u5c06\u672c\u5730\u5206\u652f\u4e0a\u4f20\u5230\u4e2d\u5fc3\u670d\u52a1\u5668\u3002<\/p>\n<p>TortoiseGit\u5728\u5c06\u4e00\u4e2a\u65b0\u5206\u652f\u4e0a\u4f20\u5230\u4e2d\u5fc3\u670d\u52a1\u5668\u65f6\uff0c\u9996\u5148\u5728\u4e2d\u5fc3\u670d\u52a1\u5668\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5206\u652f\uff0c\u7136\u540e\u518d\u5c06\u672c\u5730\u5206\u652f\u4e0a\u9762\u7684\u4fee\u6539push\u5230\u8fdc\u7a0b\u65b0\u521b\u5efa\u7684\u5206\u652f\u4e0a\u9762.<\/p>\n<p>\u5728Push\u65b0\u5206\u652f\u5230\u4e2d\u5fc3\u670d\u52a1\u5668\u4e0a\u65f6\uff0c\u901a\u8fc7\u5728\u672c\u5730\u670d\u52a1\u5668\u6267\u884cPUSH\u64cd\u4f5c\uff0c\u5728PUSH\u5bf9\u8bdd\u6846\u91cc\u4fdd\u6301\u8fdc\u7a0b\u5206\u652f\u4e3a\u7a7a\u767d\uff0c\u5219\u5728PUSH\u7684\u65f6\u5019\u8fdc\u7a0b\u670d\u52a1\u5668\u53d1\u73b0\u8fdc\u7a0b\u6ca1\u6709\u8be5\u5206\u652f\uff0c\u6b64\u65f6\u4f1a\u81ea\u52a8\u521b\u5efa\u4e00\u4e2a\u548c\u672c\u5730\u5206\u652f\u540d\u79f0\u4e00\u6837\u7684\u5206\u652f\uff0c\u5e76\u5c06\u672c\u5730\u5206\u652f\u7684\u5185\u5bb9\u4e0a\u4f20\u5230\u8be5\u5206\u652f.<\/p>\n<p><a href=\"http:\/\/doophp.sinaapp.com\/archives\/other\/branches-options-with-tortoisegit.html\/attachment\/1-3\" rel=\"attachment wp-att-1464\"><img loading=\"lazy\" class=\"alignnone size-full wp-image-1464\" title=\"1\" src=\"http:\/\/doophp-wordpress.stor.sinaapp.com\/uploads\/2012\/04\/1.jpg\" alt=\"\" width=\"455\" height=\"446\" srcset=\"https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/1.jpg 455w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/1-150x147.jpg 150w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/1-300x294.jpg 300w\" sizes=\"(max-width: 455px) 100vw, 455px\" \/><\/a><\/p>\n<p><a href=\"http:\/\/doophp.sinaapp.com\/archives\/other\/branches-options-with-tortoisegit.html\/attachment\/2\" rel=\"attachment wp-att-1465\"><img loading=\"lazy\" class=\"alignnone size-full wp-image-1465\" title=\"2\" src=\"http:\/\/doophp-wordpress.stor.sinaapp.com\/uploads\/2012\/04\/2.jpg\" alt=\"\" width=\"455\" height=\"305\" srcset=\"https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/2.jpg 455w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/2-150x100.jpg 150w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/2-300x201.jpg 300w\" sizes=\"(max-width: 455px) 100vw, 455px\" \/><\/a><\/p>\n<p>\u5982\u679c\u518d\u6b21PUSH\u672c\u5730\u5206\u652f\u5185\u5bb9\u5230\u4e2d\u5fc3\u670d\u52a1\u5668\u7684\u65f6\u5019\uff0c\u6b64\u65f6\u5728TortoiseGit\u7684PUSH\u5bf9\u8bdd\u6846\u4fdd\u6301\u8fdc\u7a0b\u5206\u652f\u4e3a\u7a7a\u767d\u7684\u65f6\u5019\uff0c\u4e2d\u5fc3\u670d\u52a1\u5668\u4f1a\u9996\u5148\u67e5\u770b\u8fdc\u7a0b\u662f\u5305\u542b\u4e0e\u672c\u5730\u5206\u652f\u540c\u540d\u5206\u652f\uff0c\u6709\u5219\u76f4\u63a5\u5c06\u672c\u5730\u7248\u672c\u4e0a\u4f20\u5230\u8be5\u5206\u652f.<\/p>\n<p><a href=\"http:\/\/doophp.sinaapp.com\/archives\/other\/branches-options-with-tortoisegit.html\/attachment\/3\" rel=\"attachment wp-att-1466\"><img loading=\"lazy\" class=\"alignnone size-full wp-image-1466\" title=\"3\" src=\"http:\/\/doophp-wordpress.stor.sinaapp.com\/uploads\/2012\/04\/3.jpg\" alt=\"\" width=\"455\" height=\"305\" srcset=\"https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/3.jpg 455w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/3-150x100.jpg 150w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/3-300x201.jpg 300w\" sizes=\"(max-width: 455px) 100vw, 455px\" \/><\/a><\/p>\n<p><strong>\u83b7\u53d6\u8fdc\u7a0b\u5206\u652f\uff08Fetching the remote branch\uff09<\/strong><\/p>\n<p>\u6709\u65f6\u5019\u6211\u4eec\u60f3\u8981\u4ece\u8fdc\u7a0b\u670d\u52a1\u5668Fetch\u83b7\u53d6\u6700\u65b0\u4e0a\u4f20\u7684\u65b0\u5206\u652f\uff0c\u6709\u4eba\u53ef\u80fd\u4f1a\u60f3\u53ef\u901a\u8fc7\u5148\u5728\u672c\u5730\u751f\u6210\u4e00\u4e2a\u65b0\u5206\u652f\uff0c\u7136\u540e\u518dpull\u8fdc\u7a0b\u6211\u4eec\u60f3\u8981\u7684\u5206\u652f\u5230\u6211\u4eec\u5728\u672c\u5730\u521a\u521a\u65b0\u5efa\u7684\u5206\u652f\u4e0a\u3002\u901a\u8fc7pull\u65b9\u5f0f\u5b9e\u9645\u4e0a\u662f\uff0c\u5148\u5728\u672c\u5730\u751f\u6210\u5206\u652f\u518d\u901a\u8fc7pull\u65b9\u5f0f\u5c06\u8fdc\u7a0b\u5206\u652f\u5408\u5e76\u5230\u672c\u5730\u751f\u6210\u7684\u5206\u652f\u4e0a.<\/p>\n<p>\u6211\u4eec\u6216\u8bb8\u8fd8\u53ef\u4ee5\u6709\u53e6\u5916\u4e00\u79cd\u65b9\u5f0f\uff1a\u672c\u5730\u751f\u6210\u4e00\u4e2a\u57fa\u4e8e\u8fdc\u7a0b\u5206\u652f\u7684\u5206\u652f\uff0c\u4e5f\u53ef\u4ee5\u8fbe\u5230\u540c\u6837\u6548\u679c\uff0c\u800c\u4e14\u66f4\u65b9\u4fbf\u3002<\/p>\n<p><a href=\"http:\/\/doophp.sinaapp.com\/archives\/other\/branches-options-with-tortoisegit.html\/attachment\/1658_1992\" rel=\"attachment wp-att-1460\"><img loading=\"lazy\" class=\"alignnone size-full wp-image-1460\" title=\"1658_1992\" src=\"http:\/\/doophp-wordpress.stor.sinaapp.com\/uploads\/2012\/04\/1658_1992.jpg\" alt=\"\" width=\"455\" height=\"378\" srcset=\"https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/1658_1992.jpg 455w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/1658_1992-150x124.jpg 150w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/1658_1992-300x249.jpg 300w\" sizes=\"(max-width: 455px) 100vw, 455px\" \/><\/a><\/p>\n<p>\u6ce8\u610f\uff0c\u52fe\u9009\u201cBase on\u201c\u65f6\uff0c\u65b0\u5efa\u5206\u652f\u9ed8\u8ba4\u4e0e\u8fdc\u7a0b\u5206\u652f\u540c\u540d\uff0c\u6240\u4ee5\u4e3a\u4e86\u907f\u514d\u6df7\u6dc6\uff0c\u5c3d\u91cf\u4fdd\u6301\u672c\u5730\u5206\u652f\u4e0e\u8fdc\u7a0b\u5206\u652f\u540d\u79f0\u4e00\u81f4\uff0c\u5373\u53ef<\/p>\n<p>\u5728\u751f\u6210\u65b0\u5206\u652f\u65f6\u52fe\u9009\u201dSwitch to new branch\u201c\uff0c\u5c06\u5728\u751f\u6210\u65b0\u5206\u652f\u4e4b\u540e\u76f4\u63a5\u5c06\u5f53\u524d\u5de5\u4f5c\u76ee\u5f55\u8f6c\u6362\u5230\u65b0\u5efa\u5206\u652f\u4e0a<\/p>\n<p>\u5206\u533a\u5408\u5e76\uff08Merging Branch\uff09<\/p>\n<p>\u5b8c\u6210\u67d0\u5206\u652f\u5de5\u4f5c\u540e\uff0c\u5c06\u4f1a\u8003\u8651\u5c06\u8be5\u5206\u652f\u4e0a\u7684\u5de5\u4f5c\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e0a\u9762\uff0c\u8fd9\u65f6\u6211\u4eec\u5c06\u8fdb\u884c\u5206\u652f\u5408\u5e76\u64cd\u4f5c.<\/p>\n<p>\u8fdb\u884c\u5206\u652f\u5408\u5e76\u4e4b\u524d\u6211\u4eec\u9700\u8981\u660e\u786e\u54ea\u4e2a\u5206\u652f\u5c06\u8981\u5408\u5e76\u5230\u54ea\u4e2a\u5206\u652f\uff0c\u9996\u5148\u8981\u201cCheckOut\/Switch\u201d\u5230\u5c06\u8981\u5408\u5e76\u5230\u7684\u5206\u652f\uff08\u5982master\u5206\u652f\uff09,\u7136\u540e\u901a\u8fc7\u201cMerge\u201d\u83dc\u5355\u6253\u5f00\u5206\u652f\u5408\u5e76\u5bf9\u8bdd\u6846\uff0c\u9009\u62e9\u9700\u8981\u5408\u5e76\u7684\u5206\u652f\u3002<\/p>\n<p>\u5206\u652f\u5408\u5e76\u6210\u529f\u540e\uff0c\u6211\u4eec\u5373\u53ef\u4ee5\u901a\u8fc7PUSH\u64cd\u4f5c\u5c06\u5408\u5e76\u4e0a\u4f20\u5230\u4e2d\u5fc3\u670d\u52a1\u5668\u3002<\/p>\n<p><a href=\"http:\/\/doophp.sinaapp.com\/archives\/other\/branches-options-with-tortoisegit.html\/attachment\/1-6\" rel=\"attachment wp-att-1472\"><img loading=\"lazy\" class=\"alignnone size-full wp-image-1472\" title=\"1\" src=\"http:\/\/doophp-wordpress.stor.sinaapp.com\/uploads\/2012\/04\/13.jpg\" alt=\"\" width=\"271\" height=\"130\" srcset=\"https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/13.jpg 271w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/13-150x71.jpg 150w\" sizes=\"(max-width: 271px) 100vw, 271px\" \/><\/a><\/p>\n<p>&nbsp;<\/p>\n<p><a href=\"http:\/\/doophp.sinaapp.com\/archives\/other\/branches-options-with-tortoisegit.html\/attachment\/2-4\" rel=\"attachment wp-att-1473\"><img loading=\"lazy\" class=\"alignnone size-full wp-image-1473\" title=\"2\" src=\"http:\/\/doophp-wordpress.stor.sinaapp.com\/uploads\/2012\/04\/23.jpg\" alt=\"\" width=\"455\" height=\"354\" srcset=\"https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/23.jpg 455w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/23-150x116.jpg 150w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/23-300x233.jpg 300w\" sizes=\"(max-width: 455px) 100vw, 455px\" \/><\/a><\/p>\n<p><strong>\u5220\u9664\u672c\u5730\/\u8fdc\u7a0b\u5206\u652f(Deleting the local\/remote branch)<\/strong><\/p>\n<p>\u5f53\u6211\u4eec\u5c06\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5206\u652f\uff0c\u6216\u8005\u653e\u5f03\u8be5\u5206\u652f\u7684\u65f6\u5019\uff0c\u53ef\u4ee5\u5bf9\u5206\u652f\u8fdb\u884c\u5220\u9664\u64cd\u4f5c.<\/p>\n<p>\u5728TortoiseGit\u4e0a\u8fdb\u884c\u5206\u652f\u5220\u9664\u64cd\u4f5c\u975e\u5e38\u7b80\u5355\uff0c\u9996\u5148\u6253\u5f00\u201cCheckOut\/Switch\u201d\u5bf9\u8bdd\u6846\uff0c\u901a\u8fc7\u201cSwitch to \u300bBranch\u201d\u66f4\u591a\u6309\u94ae\u6253\u5f00\u5206\u652f\u5217\u8868,\u6216\u8005\u901a\u8fc7\u83dc\u5355\u201cBrowser References\u201d\u6253\u5f00\u5206\u652f\u5217\u8868\uff08\u9ed8\u8ba4\u8be5\u83dc\u5355\u662f\u9690\u85cf\u7684\uff09.\u9009\u62e9\u76f8\u5e94\u7684\u5206\u652f\uff0c\u5355\u51fb\u53f3\u952e\uff0c\u9009\u62e9\u5220\u9664.<\/p>\n<p><em>\u6ce8\u610f\uff0c\u5728\u5220\u9664\u8fdc\u7a0b\u5206\u652f\u7684\u65f6\u5019\uff0c\u672c\u5730\u5206\u652f\u5e76\u4e0d\u4f1a\u5220\u9664\uff0c\u8fd9\u4e5f\u8bf4\u660e\u4e86\u672c\u5730\u5206\u652f\u4e0e\u8fdc\u7a0b\u5206\u652f\u5e76\u65e0\u4ece\u5c5e\u5173\u7cfb\u3002<\/em><\/p>\n<p><a href=\"http:\/\/doophp.sinaapp.com\/archives\/other\/branches-options-with-tortoisegit.html\/attachment\/1-5\" rel=\"attachment wp-att-1470\"><img loading=\"lazy\" class=\"alignnone size-full wp-image-1470\" title=\"1\" src=\"http:\/\/doophp-wordpress.stor.sinaapp.com\/uploads\/2012\/04\/12.jpg\" alt=\"\" width=\"455\" height=\"325\" srcset=\"https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/12.jpg 455w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/12-150x107.jpg 150w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/12-300x214.jpg 300w\" sizes=\"(max-width: 455px) 100vw, 455px\" \/><\/a><\/p>\n<p><strong><a href=\"http:\/\/doophp.sinaapp.com\/archives\/other\/branches-options-with-tortoisegit.html\/attachment\/2-3\" rel=\"attachment wp-att-1471\"><img loading=\"lazy\" class=\"alignnone size-full wp-image-1471\" title=\"2\" src=\"http:\/\/doophp-wordpress.stor.sinaapp.com\/uploads\/2012\/04\/22.jpg\" alt=\"\" width=\"455\" height=\"457\" srcset=\"https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/22.jpg 455w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/22-150x150.jpg 150w, https:\/\/blog.vimge.com\/wp-content\/uploads\/2012\/04\/22-298x300.jpg 298w\" sizes=\"(max-width: 455px) 100vw, 455px\" \/><\/a><\/p>\n<p>\u53c2\u8003\u8d44\u6599\uff1a<br \/>\n<\/strong><a href=\"http:\/\/git-scm.com\/\">http:\/\/git-scm.com<\/a><br \/>\n<a href=\"http:\/\/joelabrahamsson.com\/entry\/remote-branches-with-tortoisegit\">http:\/\/joelabrahamsson.com\/entry\/remote-branches-with-tortoisegit<\/a><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u7248\u672c\u514b\u9686\u5206\u652f\u95ee\u9898 TortoiseGit\u5728\u514b\u9686\u5206\u652f\u7684\u65f6\u5019\uff0c\u9ed8\u8ba4\u514b\u9686master\u5206\u652f\uff0c\u514b\u9686\u540e\u672c\u5730\u5de5\u4f5c\u76ee\u5f55\u4e3a\u4e2d\u5fc3\u5668 [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[1],"tags":[61,60,62],"_links":{"self":[{"href":"https:\/\/blog.vimge.com\/wp-json\/wp\/v2\/posts\/1459"}],"collection":[{"href":"https:\/\/blog.vimge.com\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/blog.vimge.com\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/blog.vimge.com\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/blog.vimge.com\/wp-json\/wp\/v2\/comments?post=1459"}],"version-history":[{"count":6,"href":"https:\/\/blog.vimge.com\/wp-json\/wp\/v2\/posts\/1459\/revisions"}],"predecessor-version":[{"id":1477,"href":"https:\/\/blog.vimge.com\/wp-json\/wp\/v2\/posts\/1459\/revisions\/1477"}],"wp:attachment":[{"href":"https:\/\/blog.vimge.com\/wp-json\/wp\/v2\/media?parent=1459"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blog.vimge.com\/wp-json\/wp\/v2\/categories?post=1459"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blog.vimge.com\/wp-json\/wp\/v2\/tags?post=1459"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}