{"id":5207,"date":"2025-05-26T00:42:12","date_gmt":"2025-05-25T16:42:12","guid":{"rendered":"https:\/\/blog.smallken.ink\/?p=5207"},"modified":"2025-05-26T00:42:12","modified_gmt":"2025-05-25T16:42:12","slug":"tortoisegit-%e5%a6%82%e4%bd%95%e9%96%8b%e5%88%86%e6%94%af%e3%80%81%e5%90%88%e4%bd%b5%e3%80%81%e5%88%aa%e9%99%a4","status":"publish","type":"post","link":"https:\/\/blog.smallken.site\/?p=5207","title":{"rendered":"TortoiseGit \u5982\u4f55\u958b\u5206\u652f\u3001\u5408\u4f75\u3001\u522a\u9664?"},"content":{"rendered":"\n

\u597d\u7684\uff01\u4ee5\u4e0b\u662f\u4f7f\u7528 TortoiseGit<\/strong> \u5728 Windows \u4e0a\u5b8c\u6210\u300c\u958b\u65b0\u5206\u652f\u3001\u4fee\u6539\u7a0b\u5f0f\u3001\u5408\u4f75\u56de\u539f\u5206\u652f\u300d\u7684\u8a73\u7d30\u6b65\u9a5f\u3002\u6211\u6703\u5047\u8a2d\u4f60\u5df2\u7d93\u5b89\u88dd\u4e86 TortoiseGit \u548c Git for Windows\uff0c\u4e26\u4e14\u6709\u4e00\u500b\u5df2\u7d93\u514b\u9686\u597d\u7684 Git \u5009\u5eab\u3002\u4ee5\u4e0b\u662f\u5177\u9ad4\u60c5\u5883\u7684\u6b65\u9a5f\uff0c\u7c21\u55ae\u6e05\u6670\uff0c\u65b9\u4fbf\u64cd\u4f5c\uff1a<\/p>\n\n\n\n

\n\n\n\n

\u60c5\u5883\uff1a\u958b\u65b0\u5206\u652f\u3001\u4fee\u6539\u7a0b\u5f0f\u3001\u5408\u4f75\u56de\u539f\u5206\u652f<\/strong><\/h3>\n\n\n\n

\u5047\u8a2d\u4f60\u7576\u524d\u5728 main<\/code> \u5206\u652f\uff08\u6216\u7a31 master<\/code>\uff0c\u8996\u5009\u5eab\u547d\u540d\uff09\uff0c\u9700\u8981\u5275\u5efa\u4e00\u500b\u65b0\u5206\u652f feature-branch<\/code>\uff0c\u4fee\u6539\u7a0b\u5f0f\u78bc\uff0c\u7136\u5f8c\u5c07\u4fee\u6539\u5408\u4f75\u56de main<\/code> \u5206\u652f\u3002<\/p>\n\n\n\n

\u6b65\u9a5f 1\uff1a\u5275\u5efa\u4e26\u5207\u63db\u5230\u65b0\u5206\u652f<\/strong><\/h4>\n\n\n\n
    \n
  1. \u6253\u958b\u5009\u5eab\u6587\u4ef6\u593e<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n
      \n
    • \u5728 Windows \u8cc7\u6e90\u7ba1\u7406\u5668\u4e2d\uff0c\u627e\u5230\u4f60\u7684 Git \u5009\u5eab\u6587\u4ef6\u593e\uff08\u5305\u542b .git<\/code> \u6587\u4ef6\u593e\u7684\u76ee\u9304\uff09\u3002<\/li>\n\n\n\n
    • \u53f3\u9375\u9ede\u64ca\u7a7a\u767d\u8655\uff0c\u9078\u64c7 TortoiseGit -> Create Branch<\/strong>\u3002<\/li>\n<\/ul>\n\n\n\n
        \n
      1. \u8a2d\u7f6e\u5206\u652f\u540d\u7a31<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n
          \n
        • \u5728\u5f48\u51fa\u7684\u300cCreate Branch\u300d\u7a97\u53e3\u4e2d\uff0c\u8f38\u5165\u65b0\u5206\u652f\u540d\u7a31\uff0c\u4f8b\u5982 feature-branch<\/code>\u3002<\/li>\n\n\n\n
        • \u78ba\u4fdd\u300cBranch\u300d\u9078\u9805\u4e2d\u9078\u64c7\u7576\u524d\u5206\u652f\uff08\u901a\u5e38\u662f main<\/code> \u6216 master<\/code>\uff09\u4f5c\u70ba\u57fa\u790e\u5206\u652f\u3002<\/li>\n\n\n\n
        • \u52fe\u9078 Switch to new branch<\/strong>\uff08\u5207\u63db\u5230\u65b0\u5206\u652f\uff09\u3002<\/li>\n\n\n\n
        • \u9ede\u64ca OK<\/strong>\u3002<\/li>\n<\/ul>\n\n\n\n
            \n
          1. \u78ba\u8a8d\u5206\u652f\u5207\u63db<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n
              \n
            • TortoiseGit \u6703\u5275\u5efa\u4e26\u5207\u63db\u5230 feature-branch<\/code>\u3002\u4f60\u53ef\u4ee5\u5728\u8cc7\u6e90\u7ba1\u7406\u5668\u53f3\u9375\u9078\u64c7 TortoiseGit -> Git Log<\/strong> \u67e5\u770b\u7576\u524d\u5206\u652f\uff0c\u78ba\u8a8d\u662f\u5426\u5df2\u5207\u63db\u5230 feature-branch<\/code>\u3002<\/li>\n<\/ul>\n\n\n\n
              \n\n\n\n

              \u6b65\u9a5f 2\uff1a\u4fee\u6539\u7a0b\u5f0f\u78bc\u4e26\u63d0\u4ea4<\/strong><\/h4>\n\n\n\n
                \n
              1. \u4fee\u6539\u7a0b\u5f0f\u78bc<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n
                  \n
                • \u4f7f\u7528\u4f60\u7684\u7de8\u8f2f\u5668\uff08\u5982 VS Code\u3001Notepad++ \u7b49\uff09\u6253\u958b\u5009\u5eab\u4e2d\u7684\u7a0b\u5f0f\u78bc\u6587\u4ef6\uff0c\u9032\u884c\u4fee\u6539\u4e26\u4fdd\u5b58\u3002<\/li>\n<\/ul>\n\n\n\n
                    \n
                  1. \u6aa2\u67e5\u4fee\u6539\u72c0\u614b<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n
                      \n
                    • \u8fd4\u56de\u8cc7\u6e90\u7ba1\u7406\u5668\uff0c\u53f3\u9375\u9ede\u64ca\u5009\u5eab\u6587\u4ef6\u593e\uff0c\u9078\u64c7 TortoiseGit -> Check for modifications<\/strong>\u3002<\/li>\n\n\n\n
                    • \u7a97\u53e3\u6703\u986f\u793a\u6240\u6709\u4fee\u6539\u7684\u6587\u4ef6\uff08\u5df2\u4fee\u6539\u3001\u5df2\u6dfb\u52a0\u3001\u672a\u8ddf\u8e2a\u7b49\uff09\u3002<\/li>\n<\/ul>\n\n\n\n
                        \n
                      1. \u6dfb\u52a0\u4fee\u6539\u5230\u66ab\u5b58\u5340<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n
                          \n
                        • \u5728\u300cCheck for modifications\u300d\u7a97\u53e3\u4e2d\uff0c\u9078\u64c7\u9700\u8981\u63d0\u4ea4\u7684\u6587\u4ef6\uff0c\u53f3\u9375\u9ede\u64ca\u9078\u64c7 Add<\/strong>\uff08\u6dfb\u52a0\u672a\u8ddf\u8e2a\u6587\u4ef6\uff09\u6216\u76f4\u63a5\u5168\u9078\u3002<\/li>\n\n\n\n
                        • \u6216\u8005\uff0c\u53f3\u9375\u9ede\u64ca\u5009\u5eab\u6587\u4ef6\u593e\uff0c\u9078\u64c7 TortoiseGit -> Add<\/strong>\uff0c\u9078\u64c7\u8981\u66ab\u5b58\u7684\u6587\u4ef6\uff0c\u9ede\u64ca OK<\/strong>\u3002<\/li>\n<\/ul>\n\n\n\n
                            \n
                          1. \u63d0\u4ea4\u4fee\u6539<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n
                              \n
                            • \u53f3\u9375\u9ede\u64ca\u5009\u5eab\u6587\u4ef6\u593e\uff0c\u9078\u64c7 TortoiseGit -> Commit -> “feature-branch”<\/strong>\u3002<\/li>\n\n\n\n
                            • \u5728\u5f48\u51fa\u7684\u63d0\u4ea4\u7a97\u53e3\u4e2d\uff1a\n
                                \n
                              • \u8f38\u5165\u63d0\u4ea4\u8a0a\u606f\uff08\u4f8b\u5982\u300cAdd new feature to project\u300d\uff09\u3002<\/li>\n\n\n\n
                              • \u78ba\u8a8d\u52fe\u9078\u7684\u6587\u4ef6\u662f\u6b63\u78ba\u7684\u3002<\/li>\n\n\n\n
                              • \u9ede\u64ca OK<\/strong> \u5b8c\u6210\u63d0\u4ea4\u3002<\/li>\n<\/ul>\n<\/li>\n\n\n\n
                              • \u5982\u679c\u9700\u8981\u63a8\u9001\u5230\u9060\u7aef\u5009\u5eab\uff0c\u52fe\u9078 Push immediately<\/strong> \u6216\u7a0d\u5f8c\u624b\u52d5\u63a8\u9001\u3002<\/li>\n<\/ul>\n\n\n\n
                                  \n
                                1. \uff08\u53ef\u9078\uff09\u63a8\u9001\u5230\u9060\u7aef<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n
                                    \n
                                  • \u5982\u679c\u4f60\u7684\u5009\u5eab\u6709\u9060\u7aef\uff08\u5982 GitHub\uff09\uff0c\u53f3\u9375\u9ede\u64ca\u5009\u5eab\u6587\u4ef6\u593e\uff0c\u9078\u64c7 TortoiseGit -> Push<\/strong>\u3002<\/li>\n\n\n\n
                                  • \u5728\u300cPush\u300d\u7a97\u53e3\u4e2d\uff0c\u9078\u64c7\u9060\u7aef\u5009\u5eab\uff0c\u78ba\u4fdd\u5206\u652f\u9078\u70ba feature-branch<\/code>\uff0c\u9ede\u64ca OK<\/strong>\u3002<\/li>\n<\/ul>\n\n\n\n
                                    \n\n\n\n

                                    \u6b65\u9a5f 3\uff1a\u5408\u4f75\u56de\u539f\u5206\u652f\uff08main\uff09<\/strong><\/h4>\n\n\n\n
                                      \n
                                    1. \u5207\u63db\u56de\u4e3b\u5206\u652f<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n
                                        \n
                                      • \u53f3\u9375\u9ede\u64ca\u5009\u5eab\u6587\u4ef6\u593e\uff0c\u9078\u64c7 TortoiseGit -> Switch\/Checkout<\/strong>\u3002<\/li>\n\n\n\n
                                      • \u5728\u5f48\u51fa\u7684\u7a97\u53e3\u4e2d\uff0c\u9078\u64c7 main<\/code>\uff08\u6216 master<\/code>\uff09\uff0c\u9ede\u64ca OK<\/strong>\u3002<\/li>\n\n\n\n
                                      • \u78ba\u8a8d\u5df2\u5207\u63db\u5230 main<\/code> \u5206\u652f\uff08\u53ef\u901a\u904e Git Log<\/strong> \u67e5\u770b\uff09\u3002<\/li>\n<\/ul>\n\n\n\n
                                          \n
                                        1. \u5408\u4f75\u5206\u652f<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n
                                            \n
                                          • \u53f3\u9375\u9ede\u64ca\u5009\u5eab\u6587\u4ef6\u593e\uff0c\u9078\u64c7 TortoiseGit -> Merge<\/strong>\u3002<\/li>\n\n\n\n
                                          • \u5728\u300cMerge\u300d\u7a97\u53e3\u4e2d\uff1a\n
                                              \n
                                            • \u9078\u64c7\u300cBranch\u300d\u9078\u9805\uff0c\u7136\u5f8c\u5f9e\u4e0b\u62c9\u5217\u8868\u9078\u64c7 feature-branch<\/code>\u3002<\/li>\n\n\n\n
                                            • \u78ba\u4fdd\u300cMerge into\u300d\u662f main<\/code>\u3002<\/li>\n\n\n\n
                                            • \uff08\u53ef\u9078\uff09\u52fe\u9078\u300cCreate a merge commit\u300d\u4ee5\u4fdd\u7559\u5408\u4f75\u8a18\u9304\uff08\u63a8\u85a6\uff09\u3002<\/li>\n\n\n\n
                                            • \u9ede\u64ca OK<\/strong> \u57f7\u884c\u5408\u4f75\u3002<\/li>\n<\/ul>\n<\/li>\n<\/ul>\n\n\n\n
                                                \n
                                              1. \u89e3\u6c7a\u885d\u7a81\uff08\u5982\u679c\u6709\uff09<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n
                                                  \n
                                                • \u5982\u679c\u5408\u4f75\u904e\u7a0b\u4e2d\u51fa\u73fe\u885d\u7a81\uff0cTortoiseGit \u6703\u63d0\u793a\u4e26\u6253\u958b TortoiseGitMerge<\/strong> \u5de5\u5177\u3002<\/li>\n\n\n\n
                                                • \u5728\u885d\u7a81\u6587\u4ef6\u4e2d\uff0c\u624b\u52d5\u9078\u64c7\u4fdd\u7559\u6216\u7de8\u8f2f\u885d\u7a81\u90e8\u5206\uff0c\u4fdd\u5b58\u5f8c\u6a19\u8a18\u70ba\u5df2\u89e3\u6c7a\u3002<\/li>\n\n\n\n
                                                • \u8fd4\u56de\u63d0\u4ea4\u7a97\u53e3\uff0c\u63d0\u4ea4\u5408\u4f75\u7d50\u679c\u3002<\/li>\n<\/ul>\n\n\n\n
                                                    \n
                                                  1. \u63d0\u4ea4\u5408\u4f75\u7d50\u679c<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n
                                                      \n
                                                    • \u5982\u679c\u5408\u4f75\u751f\u6210\u4e86\u4e00\u500b\u5408\u4f75\u63d0\u4ea4\uff08Merge Commit\uff09\uff0c\u53f3\u9375\u9078\u64c7 TortoiseGit -> Commit<\/strong>\uff0c\u8f38\u5165\u5408\u4f75\u63d0\u4ea4\u8a0a\u606f\uff0c\u9ede\u64ca OK<\/strong>\u3002<\/li>\n<\/ul>\n\n\n\n
                                                        \n
                                                      1. \u63a8\u9001\u5230\u9060\u7aef\uff08\u53ef\u9078\uff09<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n
                                                          \n
                                                        • \u53f3\u9375\u9ede\u64ca\u5009\u5eab\u6587\u4ef6\u593e\uff0c\u9078\u64c7 TortoiseGit -> Push<\/strong>\u3002<\/li>\n\n\n\n
                                                        • \u9078\u64c7\u9060\u7aef\u5009\u5eab\uff0c\u78ba\u4fdd\u5206\u652f\u70ba main<\/code>\uff0c\u9ede\u64ca OK<\/strong>\u3002<\/li>\n<\/ul>\n\n\n\n
                                                          \n\n\n\n

                                                          \u6b65\u9a5f 4\uff1a\uff08\u53ef\u9078\uff09\u522a\u9664\u5206\u652f<\/strong><\/h4>\n\n\n\n
                                                            \n
                                                          1. \u522a\u9664\u672c\u5730\u5206\u652f<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n
                                                              \n
                                                            • \u53f3\u9375\u9ede\u64ca\u5009\u5eab\u6587\u4ef6\u593e\uff0c\u9078\u64c7 TortoiseGit -> Create Branch<\/strong>\uff08\u6216 Git Log<\/strong>\uff09\u3002<\/li>\n\n\n\n
                                                            • \u5728\u5206\u652f\u7a97\u53e3\u4e2d\uff0c\u9078\u64c7 feature-branch<\/code>\uff0c\u9ede\u64ca Delete branch<\/strong>\u3002<\/li>\n\n\n\n
                                                            • \u78ba\u8a8d\u522a\u9664\u3002<\/li>\n<\/ul>\n\n\n\n
                                                                \n
                                                              1. \u522a\u9664\u9060\u7aef\u5206\u652f\uff08\u5982\u679c\u5df2\u63a8\u9001\uff09<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n
                                                                  \n
                                                                • \u53f3\u9375\u9ede\u64ca\u5009\u5eab\u6587\u4ef6\u593e\uff0c\u9078\u64c7 TortoiseGit -> Push<\/strong>\u3002<\/li>\n\n\n\n
                                                                • \u5728\u300cPush\u300d\u7a97\u53e3\u4e2d\uff0c\u52fe\u9078 Delete remote branch<\/strong>\uff0c\u9078\u64c7 feature-branch<\/code>\uff0c\u9ede\u64ca OK<\/strong>\u3002<\/li>\n<\/ul>\n\n\n\n
                                                                  \n\n\n\n

                                                                  \u6ce8\u610f\u4e8b\u9805<\/strong><\/h3>\n\n\n\n
                                                                    \n
                                                                  • \u78ba\u8a8d\u5206\u652f\u72c0\u614b<\/strong>\uff1a\u6bcf\u6b21\u64cd\u4f5c\u524d\uff0c\u5efa\u8b70\u4f7f\u7528 TortoiseGit -> Git Log<\/strong> \u78ba\u8a8d\u7576\u524d\u5206\u652f\u548c\u63d0\u4ea4\u6b77\u53f2\u3002<\/li>\n\n\n\n
                                                                  • \u885d\u7a81\u8655\u7406<\/strong>\uff1a\u5982\u679c\u5408\u4f75\u6642\u6709\u885d\u7a81\uff0cTortoiseGitMerge \u5de5\u5177\u6703\u986f\u793a\u885d\u7a81\u884c\uff0c\u5efa\u8b70\u4ed4\u7d30\u6aa2\u67e5\u4e26\u6e2c\u8a66\u7a0b\u5f0f\u78bc\u3002<\/li>\n\n\n\n
                                                                  • \u9060\u7aef\u5009\u5eab<\/strong>\uff1a\u5982\u679c\u9700\u8981\u8207\u9060\u7aef\u5354\u4f5c\uff0c\u78ba\u4fdd\u5728\u63d0\u4ea4\u548c\u5408\u4f75\u5f8c\u53ca\u6642\u63a8\u9001\uff08Push\uff09\u3002<\/li>\n\n\n\n
                                                                  • \u5099\u4efd<\/strong>\uff1a\u4fee\u6539\u524d\u5efa\u8b70\u5099\u4efd\u91cd\u8981\u6587\u4ef6\uff0c\u4ee5\u9632\u842c\u4e00\u9700\u8981\u6062\u5fa9\u3002<\/li>\n<\/ul>\n\n\n\n
                                                                    \n\n\n\n

                                                                    \u7c21\u55ae\u7e3d\u7d50<\/strong><\/h3>\n\n\n\n
                                                                      \n
                                                                    1. \u5275\u5efa\u5206\u652f<\/strong>\uff1a\u53f3\u9375 -> Create Branch -> \u8f38\u5165 feature-branch<\/code> -> \u52fe\u9078 Switch\u3002<\/li>\n\n\n\n
                                                                    2. \u4fee\u6539\u4e26\u63d0\u4ea4<\/strong>\uff1a\u4fee\u6539\u7a0b\u5f0f\u78bc -> \u53f3\u9375 -> Add -> Commit -> \u8f38\u5165\u8a0a\u606f\u3002<\/li>\n\n\n\n
                                                                    3. \u5408\u4f75\u56de main<\/strong>\uff1a\u53f3\u9375 -> Switch\/Checkout -> \u9078 main -> Merge -> \u9078 feature-branch<\/code> -> \u89e3\u6c7a\u885d\u7a81\uff08\u82e5\u6709\uff09 -> \u63d0\u4ea4\u3002<\/li>\n\n\n\n
                                                                    4. \uff08\u53ef\u9078\uff09\u63a8\u9001\u8207\u522a\u9664<\/strong>\uff1aPush \u5230\u9060\u7aef -> \u522a\u9664 feature-branch<\/code>\u3002<\/li>\n<\/ol>\n\n\n\n

                                                                      \u5982\u679c\u6709\u4efb\u4f55\u6b65\u9a5f\u4e0d\u78ba\u5b9a\u6216\u9047\u5230\u554f\u984c\uff08\u4f8b\u5982\u885d\u7a81\u3001\u63a8\u9001\u5931\u6557\uff09\uff0c\u8acb\u544a\u8a34\u6211\u5177\u9ad4\u60c5\u6cc1\uff0c\u6211\u6703\u5e6b\u4f60\u9032\u4e00\u6b65\u89e3\u6c7a\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"

                                                                      \u597d\u7684\uff01\u4ee5\u4e0b\u662f\u4f7f\u7528 TortoiseGit \u5728 Windows \u4e0a\u5b8c\u6210\u300c\u958b\u65b0\u5206\u652f\u3001\u4fee\u6539\u7a0b\u5f0f\u3001\u5408\u4f75\u56de\u539f\u5206\u652f\u300d\u7684\u8a73\u7d30…<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-5207","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"_links":{"self":[{"href":"https:\/\/blog.smallken.site\/index.php?rest_route=\/wp\/v2\/posts\/5207","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/blog.smallken.site\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/blog.smallken.site\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/blog.smallken.site\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/blog.smallken.site\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=5207"}],"version-history":[{"count":1,"href":"https:\/\/blog.smallken.site\/index.php?rest_route=\/wp\/v2\/posts\/5207\/revisions"}],"predecessor-version":[{"id":5208,"href":"https:\/\/blog.smallken.site\/index.php?rest_route=\/wp\/v2\/posts\/5207\/revisions\/5208"}],"wp:attachment":[{"href":"https:\/\/blog.smallken.site\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=5207"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blog.smallken.site\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=5207"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blog.smallken.site\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=5207"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}