{"id":5205,"date":"2025-05-26T00:41:25","date_gmt":"2025-05-25T16:41:25","guid":{"rendered":"https:\/\/blog.smallken.ink\/?p=5205"},"modified":"2025-05-26T00:41:25","modified_gmt":"2025-05-25T16:41:25","slug":"visual-studio-code-%e5%a6%82%e4%bd%95%e9%96%8b%e5%88%86%e6%94%af%e5%90%88%e4%bd%b5%e5%88%aa%e9%99%a4%e5%88%86%e6%94%af","status":"publish","type":"post","link":"https:\/\/blog.smallken.site\/?p=5205","title":{"rendered":"Visual Studio Code \u5982\u4f55\u958b\u5206\u652f,\u5408\u4f75,\u522a\u9664\u5206\u652f?"},"content":{"rendered":"\n<p>\u597d\u7684\uff01\u4ee5\u4e0b\u662f\u4f7f\u7528 <strong>Visual Studio Code (VS Code)<\/strong> \u5b8c\u6210\u8207 TortoiseGit \u76f8\u540c\u60c5\u5883\uff08\u958b\u65b0\u5206\u652f\u3001\u4fee\u6539\u7a0b\u5f0f\u3001\u5408\u4f75\u56de\u539f\u5206\u652f\uff09\u7684\u8a73\u7d30\u6b65\u9a5f\u3002\u5047\u8a2d\u4f60\u5df2\u7d93\u5728 VS Code \u4e2d\u8a2d\u7f6e\u597d Git \u74b0\u5883\uff08\u5b89\u88dd\u4e86 Git for Windows\uff0c\u4e26\u914d\u7f6e\u4e86 Git \u8def\u5f91\uff09\uff0c\u4e26\u4e14\u4f60\u7684\u5009\u5eab\u5df2\u7d93\u514b\u9686\u5230\u672c\u5730\u3002VS Code \u5167\u5efa\u4e86\u5f37\u5927\u7684 Git \u6574\u5408\u529f\u80fd\uff0c\u901a\u904e\u5176 Source Control \u9762\u677f\u6216\u7d42\u7aef\u6a5f\uff08Terminal\uff09\u53ef\u4ee5\u8f15\u9b06\u5b8c\u6210 Git \u64cd\u4f5c\u3002<\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h3 class=\"wp-block-heading\"><strong>\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<p>\u5047\u8a2d\u4f60\u7576\u524d\u5728 <code>main<\/code> \u5206\u652f\uff08\u6216 <code>master<\/code>\uff0c\u8996\u5009\u5eab\u547d\u540d\uff09\uff0c\u9700\u8981\u5275\u5efa\u4e00\u500b\u65b0\u5206\u652f <code>feature-branch<\/code>\uff0c\u4fee\u6539\u7a0b\u5f0f\u78bc\uff0c\u7136\u5f8c\u5c07\u4fee\u6539\u5408\u4f75\u56de <code>main<\/code> \u5206\u652f\u3002\u4ee5\u4e0b\u662f\u4f7f\u7528 VS Code \u7684\u5177\u9ad4\u6b65\u9a5f\uff1a<\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h4 class=\"wp-block-heading\"><strong>\u6b65\u9a5f 1\uff1a\u5275\u5efa\u4e26\u5207\u63db\u5230\u65b0\u5206\u652f<\/strong><\/h4>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u6253\u958b VS Code \u4e26\u8f09\u5165\u5009\u5eab<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u6253\u958b VS Code\uff0c\u9078\u64c7 <strong>File -> Open Folder<\/strong>\uff0c\u9078\u53d6\u4f60\u7684 Git \u5009\u5eab\u6587\u4ef6\u593e\uff08\u5305\u542b <code>.git<\/code> \u6587\u4ef6\u593e\u7684\u76ee\u9304\uff09\u3002<\/li>\n\n\n\n<li>\u78ba\u8a8d\u5de6\u5074\u6d3b\u52d5\u6b04\u7684 <strong>Source Control<\/strong> \u5716\u6a19\uff08\u5206\u652f\u5716\u6a19\uff0c\u901a\u5e38\u662f\u7b2c\u4e09\u500b\uff09\u986f\u793a\u6b63\u5e38\uff0c\u8868\u660e Git \u5df2\u6b63\u78ba\u521d\u59cb\u5316\u3002<\/li>\n<\/ul>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u5275\u5efa\u65b0\u5206\u652f<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u9ede\u64ca\u5de6\u5074\u6d3b\u52d5\u6b04\u7684 <strong>Source Control<\/strong> \u9762\u677f\uff08\u5feb\u6377\u9375 <code>Ctrl+Shift+G<\/code>\uff09\u3002<\/li>\n\n\n\n<li>\u5728\u9762\u677f\u9802\u90e8\uff0c\u9ede\u64ca\u5206\u652f\u540d\u7a31\u65c1\u908a\u7684 <strong>\u2026<\/strong>\uff08\u66f4\u591a\u64cd\u4f5c\uff09\u6309\u9215\uff0c\u9078\u64c7 <strong>Branch -> Create Branch<\/strong>\u3002<\/li>\n\n\n\n<li>\u5728\u5f48\u51fa\u7684\u8f38\u5165\u6846\u4e2d\uff0c\u8f38\u5165\u65b0\u5206\u652f\u540d\u7a31\uff0c\u4f8b\u5982 <code>feature-branch<\/code>\uff0c\u6309 <strong>Enter<\/strong>\u3002<\/li>\n\n\n\n<li>VS Code \u6703\u81ea\u52d5\u5275\u5efa\u4e26\u5207\u63db\u5230 <code>feature-branch<\/code>\u3002<\/li>\n<\/ul>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u78ba\u8a8d\u5206\u652f\u5207\u63db<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u67e5\u770b VS Code \u5e95\u90e8\u72c0\u614b\u6b04\uff08\u5de6\u4e0b\u89d2\uff09\uff0c\u61c9\u986f\u793a\u7576\u524d\u5206\u652f\u70ba <code>feature-branch<\/code>\u3002<\/li>\n\n\n\n<li>\u6216\u8005\uff0c\u5728 <strong>Source Control<\/strong> \u9762\u677f\u4e2d\uff0c\u9ede\u64ca\u5206\u652f\u540d\u7a31\u78ba\u8a8d\u7576\u524d\u5206\u652f\u3002<\/li>\n<\/ul>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h4 class=\"wp-block-heading\"><strong>\u6b65\u9a5f 2\uff1a\u4fee\u6539\u7a0b\u5f0f\u78bc\u4e26\u63d0\u4ea4<\/strong><\/h4>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u4fee\u6539\u7a0b\u5f0f\u78bc<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5728 VS Code \u4e2d\u6253\u958b\u9700\u8981\u4fee\u6539\u7684\u6587\u4ef6\uff08\u4f8b\u5982 <code>main.py<\/code> \u6216 <code>index.html<\/code>\uff09\uff0c\u9032\u884c\u7a0b\u5f0f\u78bc\u7de8\u8f2f\u4e26\u4fdd\u5b58\uff08<code>Ctrl+S<\/code>\uff09\u3002<\/li>\n<\/ul>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u6aa2\u67e5\u4fee\u6539\u72c0\u614b<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5207\u63db\u5230 <strong>Source Control<\/strong> \u9762\u677f\uff08<code>Ctrl+Shift+G<\/code>\uff09\u3002<\/li>\n\n\n\n<li>\u9762\u677f\u6703\u5217\u51fa\u6240\u6709\u4fee\u6539\u7684\u6587\u4ef6\uff0c\u6a19\u8a18\u70ba\uff1a\n<ul class=\"wp-block-list\">\n<li><strong>M<\/strong>\uff08Modified\uff0c\u5df2\u4fee\u6539\uff09<\/li>\n\n\n\n<li><strong>U<\/strong>\uff08Untracked\uff0c\u672a\u8ddf\u8e2a\uff09<\/li>\n\n\n\n<li><strong>A<\/strong>\uff08Added\uff0c\u5df2\u6dfb\u52a0\uff09<\/li>\n<\/ul>\n<\/li>\n<\/ul>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u6dfb\u52a0\u4fee\u6539\u5230\u66ab\u5b58\u5340<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5728 <strong>Source Control<\/strong> \u9762\u677f\u4e2d\uff0c\u9ede\u64ca\u4fee\u6539\u6587\u4ef6\u65c1\u908a\u7684 <strong>+<\/strong> \u6309\u9215\uff0c\u5c07\u6587\u4ef6\u6dfb\u52a0\u5230\u66ab\u5b58\u5340\uff08Staged Changes\uff09\u3002<\/li>\n\n\n\n<li>\u6216\u8005\uff0c\u9ede\u64ca\u9762\u677f\u9802\u90e8\u7684 <strong>\u2026<\/strong>\uff0c\u9078\u64c7 <strong>Stage All Changes<\/strong>\uff0c\u5c07\u6240\u6709\u4fee\u6539\u4e00\u6b21\u6027\u6dfb\u52a0\u5230\u66ab\u5b58\u5340\u3002<\/li>\n<\/ul>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u63d0\u4ea4\u4fee\u6539<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5728 <strong>Source Control<\/strong> \u9762\u677f\u9802\u90e8\u7684\u8f38\u5165\u6846\u4e2d\uff0c\u8f38\u5165\u63d0\u4ea4\u8a0a\u606f\uff08\u4f8b\u5982\u300cAdd new feature to project\u300d\uff09\u3002<\/li>\n\n\n\n<li>\u9ede\u64ca\u9762\u677f\u9802\u90e8\u7684 <strong>\u2714\ufe0f Commit<\/strong> \u6309\u9215\uff08\u6216\u6309 <code>Ctrl+Enter<\/code>\uff09\u63d0\u4ea4\u66f4\u6539\u3002<\/li>\n\n\n\n<li>\u5982\u679c\u63d0\u793a\u9078\u64c7\u63d0\u4ea4\u985e\u578b\uff0c\u9078\u64c7 <strong>Commit Staged<\/strong>\uff08\u63d0\u4ea4\u5df2\u66ab\u5b58\u7684\u66f4\u6539\uff09\u3002<\/li>\n<\/ul>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\uff08\u53ef\u9078\uff09\u63a8\u9001\u5230\u9060\u7aef<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5982\u679c\u9700\u8981\u5c07 <code>feature-branch<\/code> \u63a8\u9001\u5230\u9060\u7aef\u5009\u5eab\uff08\u5982 GitHub\uff09\uff0c\u9ede\u64ca <strong>Source Control<\/strong> \u9762\u677f\u9802\u90e8\u7684 <strong>\u2026<\/strong>\uff0c\u9078\u64c7 <strong>Push<\/strong>\u3002<\/li>\n\n\n\n<li>\u5982\u679c\u9019\u662f\u7b2c\u4e00\u6b21\u63a8\u9001\u65b0\u5206\u652f\uff0cVS Code \u6703\u63d0\u793a\u8a2d\u7f6e\u9060\u7aef\u5206\u652f\uff0c\u78ba\u8a8d\u5f8c\u6309 <strong>OK<\/strong>\uff08\u901a\u5e38\u662f <code>origin\/feature-branch<\/code>\uff09\u3002<\/li>\n<\/ul>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h4 class=\"wp-block-heading\"><strong>\u6b65\u9a5f 3\uff1a\u5408\u4f75\u56de\u539f\u5206\u652f\uff08main\uff09<\/strong><\/h4>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u5207\u63db\u56de\u4e3b\u5206\u652f<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u9ede\u64ca <strong>Source Control<\/strong> \u9762\u677f\u9802\u90e8\u7684\u5206\u652f\u540d\u7a31\uff08<code>feature-branch<\/code>\uff09\u6216\u5e95\u90e8\u72c0\u614b\u6b04\u7684\u5206\u652f\u540d\u7a31\u3002<\/li>\n\n\n\n<li>\u9078\u64c7 **main<code>\uff08\u6216<\/code>master<code>\uff09\uff0cVS Code \u6703\u5207\u63db\u5230<\/code>main` \u5206\u652f\u3002<\/li>\n\n\n\n<li>\u78ba\u8a8d\u72c0\u614b\u6b04\u986f\u793a\u7576\u524d\u5206\u652f\u70ba <code>main<\/code>\u3002<\/li>\n<\/ul>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u5408\u4f75\u5206\u652f<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5728 <strong>Source Control<\/strong> \u9762\u677f\uff0c\u9ede\u64ca <strong>\u2026<\/strong>\uff0c\u9078\u64c7 <strong>Branch -> Merge Branch<\/strong>\u3002<\/li>\n\n\n\n<li>\u5728\u5f48\u51fa\u7684\u5206\u652f\u5217\u8868\u4e2d\uff0c\u9078\u64c7 <code>feature-branch<\/code>\uff0c\u6309 <strong>Enter<\/strong>\u3002<\/li>\n\n\n\n<li>VS Code \u6703\u57f7\u884c\u5408\u4f75\u64cd\u4f5c\uff0c\u5c07 <code>feature-branch<\/code> \u7684\u66f4\u6539\u5408\u4f75\u5230 <code>main<\/code>\u3002<\/li>\n<\/ul>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u89e3\u6c7a\u885d\u7a81\uff08\u5982\u679c\u6709\uff09<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5982\u679c\u5408\u4f75\u6642\u51fa\u73fe\u885d\u7a81\uff0cVS Code \u6703\u5728\u7de8\u8f2f\u5668\u4e2d\u9ad8\u4eae\u986f\u793a\u885d\u7a81\u6587\u4ef6\u3002<\/li>\n\n\n\n<li>\u6253\u958b\u885d\u7a81\u6587\u4ef6\uff0c\u6703\u770b\u5230\u985e\u4f3c\u4ee5\u4e0b\u7684\u6a19\u8a18\uff1a<br><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD \uff08main \u5206\u652f\u7684\u5167\u5bb9\uff09 ======= \uff08feature-branch \u7684\u5167\u5bb9\uff09 >>>>>>> feature-branch<\/code><\/li>\n\n\n\n<li>\u624b\u52d5\u7de8\u8f2f\u885d\u7a81\u90e8\u5206\uff0c\u4fdd\u7559\u9700\u8981\u7684\u5167\u5bb9\uff0c\u522a\u9664\u885d\u7a81\u6a19\u8a18\uff08<code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;<\/code>, <code>=======<\/code>, <code>>>>>>>><\/code>\uff09\u3002<\/li>\n\n\n\n<li>\u4fdd\u5b58\u6587\u4ef6\u5f8c\uff0c\u5728 <strong>Source Control<\/strong> \u9762\u677f\u4e2d\uff0c\u9ede\u64ca <strong>+<\/strong> \u5c07\u89e3\u6c7a\u5f8c\u7684\u6587\u4ef6\u6dfb\u52a0\u5230\u66ab\u5b58\u5340\u3002<\/li>\n\n\n\n<li>\u9ede\u64ca <strong>\u2714\ufe0f Commit<\/strong> \u63d0\u4ea4\u5408\u4f75\u7d50\u679c\uff0c\u8f38\u5165\u63d0\u4ea4\u8a0a\u606f\uff08\u4f8b\u5982\u300cMerge feature-branch into main\u300d\uff09\u3002<\/li>\n<\/ul>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u63a8\u9001\u5230\u9060\u7aef\uff08\u53ef\u9078\uff09<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5728 <strong>Source Control<\/strong> \u9762\u677f\uff0c\u9ede\u64ca <strong>\u2026<\/strong>\uff0c\u9078\u64c7 <strong>Push<\/strong>\uff0c\u5c07 <code>main<\/code> \u5206\u652f\u7684\u66f4\u6539\u63a8\u9001\u5230\u9060\u7aef\u5009\u5eab\u3002<\/li>\n<\/ul>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h4 class=\"wp-block-heading\"><strong>\u6b65\u9a5f 4\uff1a\uff08\u53ef\u9078\uff09\u522a\u9664\u5206\u652f<\/strong><\/h4>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u522a\u9664\u672c\u5730\u5206\u652f<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5728 <strong>Source Control<\/strong> \u9762\u677f\uff0c\u9ede\u64ca <strong>\u2026<\/strong>\uff0c\u9078\u64c7 <strong>Branch -> Delete Branch<\/strong>\u3002<\/li>\n\n\n\n<li>\u9078\u64c7 <code>feature-branch<\/code>\uff0c\u78ba\u8a8d\u522a\u9664\u3002<\/li>\n<\/ul>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u522a\u9664\u9060\u7aef\u5206\u652f\uff08\u5982\u679c\u5df2\u63a8\u9001\uff09<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u6253\u958b VS Code \u7684\u7d42\u7aef\u6a5f\uff08<strong>Terminal -> New Terminal<\/strong>\uff0c\u5feb\u6377\u9375 `Ctrl+&#8220;\uff09\u3002<\/li>\n\n\n\n<li>\u8f38\u5165\u4ee5\u4e0b\u547d\u4ee4\u4e26\u57f7\u884c\uff1a<br><code>bash git push origin --delete feature-branch<\/code><\/li>\n\n\n\n<li>\u6216\u8005\uff0c\u5728 <strong>Source Control<\/strong> \u9762\u677f\u9ede\u64ca <strong>\u2026<\/strong>\uff0c\u9078\u64c7 <strong>Push<\/strong>\uff0c\u7136\u5f8c\u624b\u52d5\u6307\u5b9a\u522a\u9664\u9060\u7aef\u5206\u652f\uff08\u9700\u8981\u7d42\u7aef\u6a5f\u8f14\u52a9\uff09\u3002<\/li>\n<\/ul>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h3 class=\"wp-block-heading\"><strong>\u4f7f\u7528\u7d42\u7aef\u6a5f\u4f5c\u70ba\u66ff\u4ee3\uff08\u53ef\u9078\uff09<\/strong><\/h3>\n\n\n\n<p>\u5982\u679c\u4f60\u66f4\u559c\u6b61\u547d\u4ee4\u884c\uff0cVS Code \u7684\u5167\u5efa\u7d42\u7aef\u6a5f\u4e5f\u53ef\u4ee5\u5b8c\u6210\u6240\u6709\u64cd\u4f5c\uff1a<\/p>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u5275\u5efa\u4e26\u5207\u63db\u5206\u652f<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>   git checkout -b feature-branch<\/code><\/pre>\n\n\n\n<ol start=\"2\" class=\"wp-block-list\">\n<li><strong>\u6dfb\u52a0\u4e26\u63d0\u4ea4\u4fee\u6539<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>   git add .\n   git commit -m \"Add new feature to project\"<\/code><\/pre>\n\n\n\n<ol start=\"3\" class=\"wp-block-list\">\n<li><strong>\u63a8\u9001\u65b0\u5206\u652f\uff08\u53ef\u9078\uff09<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>   git push origin feature-branch<\/code><\/pre>\n\n\n\n<ol start=\"4\" class=\"wp-block-list\">\n<li><strong>\u5207\u63db\u56de main \u4e26\u5408\u4f75<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>   git checkout main\n   git merge feature-branch<\/code><\/pre>\n\n\n\n<ol start=\"5\" class=\"wp-block-list\">\n<li><strong>\u89e3\u6c7a\u885d\u7a81\uff08\u82e5\u6709\uff09<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u7de8\u8f2f\u885d\u7a81\u6587\u4ef6\uff0c\u4fdd\u5b58\u5f8c\u57f7\u884c\uff1a<br><code>bash git add . git commit<\/code><\/li>\n<\/ul>\n\n\n\n<ol start=\"5\" class=\"wp-block-list\">\n<li><strong>\u63a8\u9001 main\uff08\u53ef\u9078\uff09<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>   git push origin main<\/code><\/pre>\n\n\n\n<ol start=\"7\" class=\"wp-block-list\">\n<li><strong>\u522a\u9664\u5206\u652f<\/strong>\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>   git branch -d feature-branch\n   git push origin --delete feature-branch<\/code><\/pre>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h3 class=\"wp-block-heading\"><strong>\u6ce8\u610f\u4e8b\u9805<\/strong><\/h3>\n\n\n\n<ul class=\"wp-block-list\">\n<li><strong>Git \u914d\u7f6e<\/strong>\uff1a\u78ba\u4fdd VS Code \u5df2\u6b63\u78ba\u914d\u7f6e Git\uff08\u5728 <strong>File -> Preferences -> Settings<\/strong> \u4e2d\u641c\u7d22 <code>git.path<\/code> \u4e26\u78ba\u8a8d\u6307\u5411 <code>git.exe<\/code>\uff09\u3002<\/li>\n\n\n\n<li><strong>\u64f4\u5c55\u63a8\u85a6<\/strong>\uff1a\u5b89\u88dd <strong>GitLens<\/strong> \u6216 <strong>Git Graph<\/strong> \u64f4\u5c55\uff0c\u589e\u5f37 Git \u53ef\u8996\u5316\u529f\u80fd\uff08\u5982\u67e5\u770b\u63d0\u4ea4\u6b77\u53f2\u3001\u5206\u652f\u5716\uff09\u3002<\/li>\n\n\n\n<li><strong>\u885d\u7a81\u8655\u7406<\/strong>\uff1aVS Code \u7684\u885d\u7a81\u89e3\u6c7a\u5de5\u5177\u975e\u5e38\u76f4\u89c0\uff0c\u5efa\u8b70\u719f\u6089\u5176\u4e09\u8def\u5408\u4f75\uff08Three-Way Merge\uff09\u754c\u9762\u3002<\/li>\n\n\n\n<li><strong>\u9060\u7aef\u5009\u5eab<\/strong>\uff1a\u5982\u679c\u9700\u8981\u8207\u9060\u7aef\u5354\u4f5c\uff0c\u78ba\u4fdd\u5728\u63a8\u9001\u524d\u914d\u7f6e\u597d\u9060\u7aef\u5009\u5eab\u5730\u5740\uff08\u53ef\u5728 <code>.git\/config<\/code> \u4e2d\u67e5\u770b\uff09\u3002<\/li>\n\n\n\n<li><strong>\u5099\u4efd<\/strong>\uff1a\u4fee\u6539\u524d\u5efa\u8b70\u5099\u4efd\u91cd\u8981\u6587\u4ef6\uff0c\u4ee5\u9632\u885d\u7a81\u6216\u8aa4\u64cd\u4f5c\u3002<\/li>\n<\/ul>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h3 class=\"wp-block-heading\"><strong>\u7c21\u55ae\u7e3d\u7d50<\/strong><\/h3>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u5275\u5efa\u5206\u652f<\/strong>\uff1aSource Control -> \u2026 -> Create Branch -> \u8f38\u5165 <code>feature-branch<\/code>\u3002<\/li>\n\n\n\n<li><strong>\u4fee\u6539\u4e26\u63d0\u4ea4<\/strong>\uff1a\u7de8\u8f2f\u7a0b\u5f0f\u78bc -> \u4fdd\u5b58 -> Source Control -> Stage Changes -> Commit\uff08\u8f38\u5165\u8a0a\u606f\uff09\u3002<\/li>\n\n\n\n<li><strong>\u5408\u4f75\u56de main<\/strong>\uff1a\u5207\u63db\u5230 <code>main<\/code>\uff08Source Control -> \u2026 -> Checkout to\uff09 -> Merge Branch -> \u9078 <code>feature-branch<\/code> -> \u89e3\u6c7a\u885d\u7a81\uff08\u82e5\u6709\uff09 -> Commit\u3002<\/li>\n\n\n\n<li><strong>\uff08\u53ef\u9078\uff09\u63a8\u9001\u8207\u522a\u9664<\/strong>\uff1aPush <code>main<\/code> -> Delete Branch\uff08<code>feature-branch<\/code>\uff09\u3002<\/li>\n<\/ol>\n\n\n\n<p>\u5982\u679c\u5728\u64cd\u4f5c\u904e\u7a0b\u4e2d\u9047\u5230\u554f\u984c\uff08\u4f8b\u5982\u63a8\u9001\u5931\u6557\u3001\u885d\u7a81\u7121\u6cd5\u89e3\u6c7a\uff09\uff0c\u8acb\u63d0\u4f9b\u5177\u9ad4\u932f\u8aa4\u6216\u60c5\u5883\uff0c\u6211\u6703\u5e6b\u4f60\u9032\u4e00\u6b65\u5206\u6790\u548c\u89e3\u6c7a\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u597d\u7684\uff01\u4ee5\u4e0b\u662f\u4f7f\u7528 Visual Studio Code (VS Code) \u5b8c\u6210\u8207 TortoiseGit \u76f8&#8230;<\/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-5205","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"_links":{"self":[{"href":"https:\/\/blog.smallken.site\/index.php?rest_route=\/wp\/v2\/posts\/5205","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=5205"}],"version-history":[{"count":1,"href":"https:\/\/blog.smallken.site\/index.php?rest_route=\/wp\/v2\/posts\/5205\/revisions"}],"predecessor-version":[{"id":5206,"href":"https:\/\/blog.smallken.site\/index.php?rest_route=\/wp\/v2\/posts\/5205\/revisions\/5206"}],"wp:attachment":[{"href":"https:\/\/blog.smallken.site\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=5205"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blog.smallken.site\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=5205"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blog.smallken.site\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=5205"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}