{"id":39,"date":"2023-10-03T10:36:58","date_gmt":"2023-10-03T02:36:58","guid":{"rendered":"https:\/\/blog.baios.net\/?p=39"},"modified":"2026-03-24T10:58:46","modified_gmt":"2026-03-24T02:58:46","slug":"git%e6%95%99%e7%a8%8b","status":"publish","type":"post","link":"https:\/\/blog.baios.net\/index.php\/2023\/10\/03\/git%e6%95%99%e7%a8%8b\/","title":{"rendered":"Git\u6559\u7a0b"},"content":{"rendered":"\n<h2 class=\"wp-block-heading\">\u4e00\u3001\u6559\u7a0b\u6982\u8ff0<\/h2>\n\n\n\n<p>\u672c\u6559\u7a0b\u4e3aGit\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u7684\u65b0\u624b\u5165\u95e8\u6587\u6863\uff0c\u8986\u76d6Git\u6838\u5fc3\u539f\u7406\u3001\u5168\u91cf\u5e38\u7528\u547d\u4ee4\u884c\u64cd\u4f5c\uff0c\u540c\u65f6\u8865\u5145\u4e3b\u6d41\u96c6\u6210\u5f00\u53d1\u73af\u5883\uff08IDE\uff09\u7684\u53ef\u89c6\u5316Git\u64cd\u4f5c\u6307\u5357\uff0c\u5e2e\u52a9\u65b0\u624b\u5feb\u901f\u638c\u63e1Git\u7684\u57fa\u7840\u4f7f\u7528\u65b9\u6cd5\u4e0e\u56e2\u961f\u534f\u4f5c\u89c4\u8303\u3002<\/p>\n\n\n\n<p>\u4e00\u822c\u73b0\u4ee3\u5316\u7684\u96c6\u6210\u5f00\u53d1\u73af\u5883\uff08\u5982IDEA\uff09\u90fd\u4f1a\u81ea\u5e26Git\u53ef\u89c6\u5316\u9762\u677f\u6216\u8005\u9009\u9879\uff0c\u6240\u4ee5\u4e0d\u9700\u8981\u6b7b\u8bb0\u786c\u80cc\u6307\u4ee4\uff0c\u8bb0\u4f4f\u5927\u6982\u6982\u5ff5\u5373\u53ef\u3002<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">\u4e8c\u3001Git\u57fa\u7840\u6982\u8ff0<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\">2.1 \u6838\u5fc3\u5b9a\u4e49<\/h3>\n\n\n\n<p>Git\u662f\u4e00\u6b3e\u5f00\u6e90\u7684\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u7528\u4e8e\u8ffd\u8e2a\u6587\u4ef6\u7684\u4fee\u6539\u5386\u53f2\uff0c\u652f\u6301\u591a\u4eba\u534f\u540c\u5f00\u53d1\uff0c\u662f\u5f53\u524d\u8f6f\u4ef6\u5f00\u53d1\u9886\u57df\u7684\u4e3b\u6d41\u7248\u672c\u7ba1\u7406\u5de5\u5177\u3002<\/p>\n\n\n\n<p>\u9700\u660e\u786e\u6838\u5fc3\u533a\u5206\uff1a<strong>Git \u2260 \u8fdc\u7a0b\u4ee3\u7801\u6258\u7ba1\u5e73\u53f0<\/strong>\u3002Git\u4e3a\u672c\u5730\u7248\u672c\u7ba1\u7406\u5de5\u5177\uff0cGitHub\u3001Gitee\u3001GitLab\u7b49\u4e3a\u57fa\u4e8eGit\u7684\u8fdc\u7a0b\u4ee3\u7801\u6258\u7ba1\u5e73\u53f0\uff0c\u7528\u4e8e\u8fdc\u7a0b\u4ed3\u5e93\u5b58\u50a8\u4e0e\u534f\u4f5c\u7ba1\u7406\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">2.2 \u6838\u5fc3\u5de5\u4f5c\u533a\u57df<\/h3>\n\n\n\n<p>Git\u7684\u6240\u6709\u64cd\u4f5c\u5747\u56f4\u7ed5\u4ee5\u4e0b4\u4e2a\u6838\u5fc3\u533a\u57df\u5b8c\u6210\uff0c\u6240\u6709\u547d\u4ee4\u7684\u672c\u8d28\u662f\u5b9e\u73b0\u6587\u4ef6\u57284\u4e2a\u533a\u57df\u4e4b\u95f4\u7684\u6d41\u8f6c\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><strong>\u5de5\u4f5c\u533a<\/strong>\uff1a\u7528\u6237\u672c\u5730\u76f4\u63a5\u7f16\u8f91\u7684\u9879\u76ee\u76ee\u5f55\uff0c\u662f\u6587\u4ef6\u4fee\u6539\u7684\u53d1\u751f\u5730\u3002<\/li>\n\n\n\n<li><strong>\u6682\u5b58\u533a<\/strong>\uff1a\u7528\u4e8e\u4e34\u65f6\u5b58\u653e\u5f85\u63d0\u4ea4\u7684\u6587\u4ef6\u4fee\u6539\uff0c\u662f\u5de5\u4f5c\u533a\u4e0e\u672c\u5730\u4ed3\u5e93\u4e4b\u95f4\u7684\u8fc7\u6e21\u533a\u57df\u3002<\/li>\n\n\n\n<li><strong>\u672c\u5730\u4ed3\u5e93<\/strong>\uff1a\u5b58\u50a8\u5728\u7528\u6237\u672c\u5730\u8bbe\u5907\u7684Git\u6570\u636e\u5e93\uff0c\u4fdd\u5b58\u9879\u76ee\u5b8c\u6574\u7684\u7248\u672c\u5386\u53f2\u4e0e\u63d0\u4ea4\u8bb0\u5f55\uff0c\u65ad\u7f51\u73af\u5883\u4e0b\u4ecd\u53ef\u64cd\u4f5c\u3002<\/li>\n\n\n\n<li><strong>\u8fdc\u7a0b\u4ed3\u5e93<\/strong>\uff1a\u90e8\u7f72\u5728\u4e91\u7aef\u670d\u52a1\u5668\u7684Git\u4ed3\u5e93\uff0c\u7528\u4e8e\u4ee3\u7801\u7684\u8fdc\u7a0b\u5907\u4efd\u3001\u5171\u4eab\u4e0e\u534f\u540c\u5f00\u53d1\u3002<\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\">2.3 .gitignore\u6587\u4ef6\u89c4\u8303<\/h3>\n\n\n\n<p><code>.gitignore<\/code>\u6587\u4ef6\u7528\u4e8e\u6307\u5b9aGit\u65e0\u9700\u8ffd\u8e2a\u7684\u6587\u4ef6\u4e0e\u76ee\u5f55\uff0c\u907f\u514d\u5c06\u975e\u5fc5\u8981\u6587\u4ef6\uff08\u5982\u4f9d\u8d56\u5305\u3001\u7f16\u8bd1\u4ea7\u7269\u3001\u672c\u5730\u914d\u7f6e\u6587\u4ef6\uff09\u7eb3\u5165\u7248\u672c\u7ba1\u7406\uff0c\u9700\u5728\u9879\u76ee\u521d\u59cb\u5316\u9636\u6bb5\u914d\u7f6e\u5b8c\u6210\u3002<\/p>\n\n\n\n<p>\u57fa\u7840\u5199\u6cd5\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u5ffd\u7565\u6574\u4e2a\u6587\u4ef6\u5939\nnode_modules\/\n.idea\/\n.vscode\/\n# \u5ffd\u7565\u6307\u5b9a\u540e\u7f00\u7684\u6587\u4ef6\n*.log\n# \u5ffd\u7565\u7279\u5b9a\u6587\u4ef6\n.env\n.DS_Store<\/code><\/pre>\n\n\n\n<p>\u65b0\u624b\u53ef\u901a\u8fc7 <a href=\"https:\/\/www.toptal.com\/developers\/gitignore\" target=\"_blank\" rel=\"noopener noreferrer\" rel=\"nofollow\" >gitignore.io<\/a> \u8f93\u5165\u9879\u76ee\u7c7b\u578b\uff0c\u76f4\u63a5\u751f\u6210\u7b26\u5408\u89c4\u8303\u7684<code>.gitignore<\/code>\u6587\u4ef6\u3002<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">\u4e09\u3001\u73af\u5883\u642d\u5efa\u4e0e\u57fa\u7840\u914d\u7f6e<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\">3.1 Git\u5b89\u88c5<\/h3>\n\n\n\n<ol class=\"wp-block-list\">\n<li>\u6253\u5f00Git\u5b98\u65b9\u4e0b\u8f7d\u5730\u5740\uff1a<a href=\"https:\/\/git-scm.com\/downloads\" target=\"_blank\" rel=\"noopener noreferrer\" rel=\"nofollow\" >https:\/\/git-scm.com\/downloads<\/a><\/li>\n\n\n\n<li>\u9009\u62e9\u5bf9\u5e94\u64cd\u4f5c\u7cfb\u7edf\u7684\u5b89\u88c5\u5305\uff0c\u4e0b\u8f7d\u540e\u6309\u9ed8\u8ba4\u914d\u7f6e\u5b8c\u6210\u5b89\u88c5\u3002<\/li>\n\n\n\n<li>\u5b89\u88c5\u9a8c\u8bc1\uff1a\u6253\u5f00\u7ec8\u7aef\uff08Windows\u4f7f\u7528CMD\/PowerShell\uff0cMac\/Linux\u4f7f\u7528\u7ec8\u7aef\uff09\uff0c\u6267\u884c\u547d\u4ee4<code>git --version<\/code>\uff0c\u82e5\u8f93\u51faGit\u7248\u672c\u53f7\uff0c\u5373\u4e3a\u5b89\u88c5\u6210\u529f\u3002<\/li>\n<\/ol>\n\n\n\n<h3 class=\"wp-block-heading\">3.2 \u5168\u5c40\u57fa\u7840\u914d\u7f6e<\/h3>\n\n\n\n<p>Git\u7684\u5168\u5c40\u914d\u7f6e\u7528\u4e8e\u6807\u8bb0\u63d0\u4ea4\u8005\u7684\u8eab\u4efd\u4fe1\u606f\uff0c\u6240\u6709\u672c\u5730\u4ed3\u5e93\u7684\u63d0\u4ea4\u90fd\u4f1a\u9ed8\u8ba4\u4f7f\u7528\u8be5\u914d\u7f6e\uff0c\u5b89\u88c5\u5b8c\u6210\u540e\u9700\u4f18\u5148\u914d\u7f6e\u3002<\/p>\n\n\n\n<p>\u8bbe\u7f6e\u5168\u5c40\u7528\u6237\u540d<\/p>\n\n\n\n<p>\u8bbe\u7f6e\u5168\u5c40\u7528\u6237\u90ae\u7bb1<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u914d\u7f6e\u5168\u5c40\u7528\u6237\u540d\uff0c\u5efa\u8bae\u4e0e\u8fdc\u7a0b\u4ee3\u7801\u6258\u7ba1\u5e73\u53f0\u7684\u7528\u6237\u540d\u4e00\u81f4\ngit config --global user.name \"\u4f60\u7684\u7528\u6237\u540d\"\n# \u914d\u7f6e\u5168\u5c40\u90ae\u7bb1\uff0c\u5efa\u8bae\u4e0e\u8fdc\u7a0b\u4ee3\u7801\u6258\u7ba1\u5e73\u53f0\u7684\u6ce8\u518c\u90ae\u7bb1\u4e00\u81f4\ngit config --global user.email \"\u4f60\u7684\u6ce8\u518c\u90ae\u7bb1\"<\/code><\/pre>\n\n\n\n<p>\u914d\u7f6e\u5b8c\u6210\u540e\uff0c\u53ef\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\u67e5\u770b\u6240\u6709\u914d\u7f6e\uff0c\u786e\u8ba4\u4fe1\u606f\u65e0\u8bef\u3002<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git config --list<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\">3.3 HTTP\u4ee3\u7406\u914d\u7f6e<\/h3>\n\n\n\n<p>\u5e38\u7528\u7684Git\u6258\u7ba1\u5e73\u53f0\uff08\u5982Github\uff09\u5728\u56fd\u5185\u7684\u94fe\u63a5\u7a33\u5b9a\u6027\u582a\u5fe7\uff0c\u4e00\u822c\u4f1a\u4f7f\u7528\u4ee3\u7406\u8fdb\u884c\u94fe\u63a5\u52a0\u901f\u3002\u800cGit\u7684\u4ee3\u7406\u9700\u8981\u5355\u72ec\u8bbe\u7f6e\u624d\u53ef\u4ee5\u751f\u6548\uff0c\u5176\u4e2d127.0.0.1\u4ee3\u8868\u672c\u673a\uff0c\u7aef\u53e3\u8bf7\u81ea\u884c\u67e5\u770b\u4ee3\u7406\u8f6f\u4ef6\u3002<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u8bbe\u7f6e\u4ee3\u7406<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-code\"><code>git config --global http.proxy 127.0.0.1:7890\ngit config --global https.proxy 127.0.0.1:7890<\/code><\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u53d6\u6d88\u4ee3\u7406<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-code\"><code>git config --global --unset http.proxy\ngit config --global --unset https.proxy<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\">3.4 SSH\u5bc6\u94a5\u914d\u7f6e\uff08\u53ef\u9009\uff09<\/h3>\n\n\n\n<p>\u8fde\u63a5\u8fdc\u7a0b\u4ed3\u5e93\u652f\u6301HTTPS\u4e0eSSH\u4e24\u79cd\u534f\u8bae\uff0cHTTPS\u534f\u8bae\u6bcf\u6b21\u64cd\u4f5c\u9700\u8f93\u5165\u8d26\u53f7\u5bc6\u7801\uff0cSSH\u534f\u8bae\u914d\u7f6e\u5b8c\u6210\u540e\u53ef\u5b9e\u73b0\u514d\u5bc6\u64cd\u4f5c\uff0c\u4e00\u822c\u6765\u8bf4\u73b0\u4ee3\u5316\u7f16\u8f91\u5668\u4f1a\u5305\u62ec\u767b\u5f55\u548c\u76f8\u5173\u5f15\u5bfc\uff0c\u8fd9\u4e00\u6b65\u53ef\u4ee5\u5148\u8df3\u8fc7\u3002<\/p>\n\n\n\n<ol class=\"wp-block-list\">\n<li>\u6253\u5f00\u7ec8\u7aef\uff0c\u6267\u884c\u547d\u4ee4\u751f\u6210SSH\u5bc6\u94a5\u5bf9\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>ssh-keygen -t ed25519 -C \"\u4f60\u7684\u6ce8\u518c\u90ae\u7bb1\"<\/code><\/pre>\n\n\n\n<ol start=\"2\" class=\"wp-block-list\">\n<li>\u540e\u7eed\u5f39\u51fa\u7684\u63d0\u793a\u5168\u7a0b\u6309\u56de\u8f66\u786e\u8ba4\uff0c\u65e0\u9700\u989d\u5916\u8bbe\u7f6e\u3002<\/li>\n\n\n\n<li>\u751f\u6210\u5b8c\u6210\u540e\uff0c\u627e\u5230\u5bf9\u5e94\u7cfb\u7edf\u7684\u516c\u94a5\u6587\u4ef6\uff1a\n<ul>\n<li>Windows\u7cfb\u7edf\uff1a<code>C:\\Users\\\u4f60\u7684\u7528\u6237\u540d\\.ssh\\id_ed25519.pub<\/code><\/li>\n<li>Mac\/Linux\u7cfb\u7edf\uff1a<code>~\/.ssh\/id_ed25519.pub<\/code><\/li>\n<\/ul>\n<\/li>\n\n\n\n<li>\u7528\u6587\u672c\u7f16\u8f91\u5668\u6253\u5f00<code>.pub<\/code>\u516c\u94a5\u6587\u4ef6\uff0c\u590d\u5236\u6587\u4ef6\u5185\u7684\u5168\u90e8\u5185\u5bb9\u3002<\/li>\n\n\n\n<li>\u6253\u5f00\u8fdc\u7a0b\u4ee3\u7801\u6258\u7ba1\u5e73\u53f0\uff0c\u8fdb\u5165\u300c\u8bbe\u7f6e\u300d-\u300cSSH\u516c\u94a5\u300d\u9875\u9762\uff0c\u5c06\u590d\u5236\u7684\u516c\u94a5\u5185\u5bb9\u7c98\u8d34\u5e76\u4fdd\u5b58\u3002<\/li>\n\n\n\n<li>\u914d\u7f6e\u9a8c\u8bc1\uff1a\u7ec8\u7aef\u6267\u884c\u5bf9\u5e94\u547d\u4ee4\uff0c\u63d0\u793a\u8ba4\u8bc1\u6210\u529f\u5373\u4e3a\u914d\u7f6e\u5b8c\u6210\u3002<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code># GitHub\u5e73\u53f0\u9a8c\u8bc1\nssh -T git@github.com\n# Gitee\u5e73\u53f0\u9a8c\u8bc1\nssh -T git@gitee.com<\/code><\/pre>\n\n\n\n<h2 class=\"wp-block-heading\">\u56db\u3001Git\u6838\u5fc3\u547d\u4ee4\u884c\u64cd\u4f5c<\/h2>\n\n\n\n<p>\u672c\u7ae0\u8282\u8986\u76d6Git\u65e5\u5e38\u5f00\u53d1\u5168\u573a\u666f\u7684\u6838\u5fc3\u547d\u4ee4\uff0c\u6309\u64cd\u4f5c\u6d41\u7a0b\u4e0e\u4f7f\u7528\u573a\u666f\u5206\u7c7b\u8bf4\u660e\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">4.1 \u672c\u5730\u4ed3\u5e93\u521d\u59cb\u5316\u4e0e\u9996\u6b21\u63d0\u4ea4<\/h3>\n\n\n\n<p>\u7528\u4e8e\u5c06\u672c\u5730\u5df2\u6709\u7684\u9879\u76ee\u7eb3\u5165Git\u7248\u672c\u7ba1\u7406\uff0c\u662fGit\u4f7f\u7528\u7684\u8d77\u70b9\u3002<\/p>\n\n\n\n<ol class=\"wp-block-list\">\n<li>\u7ec8\u7aef\u8fdb\u5165\u9879\u76ee\u6839\u76ee\u5f55\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>cd \u4f60\u7684\u9879\u76ee\u76ee\u5f55\u8def\u5f84<\/code><\/pre>\n\n\n\n<ol start=\"2\" class=\"wp-block-list\">\n<li>\u521d\u59cb\u5316\u672c\u5730Git\u4ed3\u5e93\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>git init<\/code><\/pre>\n\n\n\n<p>\u6267\u884c\u540e\u5c06\u5728\u5f53\u524d\u76ee\u5f55\u751f\u6210\u9690\u85cf\u7684<code>.git<\/code>\u76ee\u5f55\uff0c\u8be5\u76ee\u5f55\u4e3aGit\u7684\u672c\u5730\u4ed3\u5e93\u6570\u636e\u5e93\uff0c\u8bf7\u52ff\u4fee\u6539\u6216\u5220\u9664\u3002<\/p>\n\n\n\n<ol start=\"3\" class=\"wp-block-list\">\n<li>\u5c06\u6587\u4ef6\u6dfb\u52a0\u81f3\u6682\u5b58\u533a\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code># \u6dfb\u52a0\u9879\u76ee\u5185\u6240\u6709\u6587\u4ef6\ngit add .\n# \u6dfb\u52a0\u6307\u5b9a\u6587\u4ef6\/\u76ee\u5f55\ngit add \u6587\u4ef6\u540d\/\u76ee\u5f55\u540d<\/code><\/pre>\n\n\n\n<ol start=\"4\" class=\"wp-block-list\">\n<li>\u63d0\u4ea4\u6682\u5b58\u533a\u5185\u5bb9\u81f3\u672c\u5730\u4ed3\u5e93\uff0c\u751f\u6210\u7248\u672c\u8bb0\u5f55\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>git commit -m \"\u63d0\u4ea4\u8bf4\u660e\"<\/code><\/pre>\n\n\n\n<p><code>-m<\/code>\u53c2\u6570\u7528\u4e8e\u6dfb\u52a0\u672c\u6b21\u63d0\u4ea4\u7684\u63cf\u8ff0\u4fe1\u606f\uff0c\u9700\u6e05\u6670\u8bf4\u660e\u672c\u6b21\u63d0\u4ea4\u7684\u4fee\u6539\u5185\u5bb9\uff0c\u4fbf\u4e8e\u540e\u7eed\u7248\u672c\u56de\u6eaf\uff1b\u6bcf\u6b21\u63d0\u4ea4\u4f1a\u751f\u6210\u552f\u4e00\u7684commit ID\uff0c\u4f5c\u4e3a\u8be5\u7248\u672c\u7684\u552f\u4e00\u6807\u8bc6\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">4.2 \u8fdc\u7a0b\u4ed3\u5e93\u5173\u8054\u4e0e\u514b\u9686<\/h3>\n\n\n\n<h4 class=\"wp-block-heading\">4.2.1 \u672c\u5730\u4ed3\u5e93\u5173\u8054\u8fdc\u7a0b\u4ed3\u5e93<\/h4>\n\n\n\n<p>\u7528\u4e8e\u5c06\u672c\u5730\u521d\u59cb\u5316\u7684\u4ed3\u5e93\u4e0e\u4e91\u7aef\u8fdc\u7a0b\u4ed3\u5e93\u7ed1\u5b9a\uff0c\u5b9e\u73b0\u4ee3\u7801\u7684\u8fdc\u7a0b\u5907\u4efd\u4e0e\u5171\u4eab\u3002<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git remote add origin \u8fdc\u7a0b\u4ed3\u5e93\u5730\u5740<\/code><\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li><code>origin<\/code>\u4e3a\u8fdc\u7a0b\u4ed3\u5e93\u7684\u9ed8\u8ba4\u522b\u540d\uff0c\u53ef\u81ea\u5b9a\u4e49\uff1b<\/li>\n\n\n\n<li>\u8fdc\u7a0b\u4ed3\u5e93\u5730\u5740\u652f\u6301SSH\u4e0eHTTPS\u4e24\u79cd\u534f\u8bae\uff0c\u63a8\u8350\u4f7f\u7528\u5df2\u914d\u7f6e\u514d\u5bc6\u7684SSH\u5730\u5740\u3002<\/li>\n<\/ul>\n\n\n\n<h4 class=\"wp-block-heading\">4.2.2 \u514b\u9686\u8fdc\u7a0b\u4ed3\u5e93\u81f3\u672c\u5730<\/h4>\n\n\n\n<p>\u7528\u4e8e\u5c06\u5df2\u6709\u7684\u4e91\u7aef\u8fdc\u7a0b\u4ed3\u5e93\u5b8c\u6574\u4e0b\u8f7d\u5230\u672c\u5730\uff0c\u81ea\u52a8\u5b8c\u6210\u4ed3\u5e93\u521d\u59cb\u5316\u4e0e\u8fdc\u7a0b\u5173\u8054\u3002<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git clone \u8fdc\u7a0b\u4ed3\u5e93\u5730\u5740<\/code><\/pre>\n\n\n\n<p>\u6267\u884c\u540e\u5c06\u5728\u5f53\u524d\u76ee\u5f55\u751f\u6210\u4e0e\u8fdc\u7a0b\u4ed3\u5e93\u540c\u540d\u7684\u9879\u76ee\u76ee\u5f55\uff0c\u65e0\u9700\u989d\u5916\u914d\u7f6e\u5373\u53ef\u76f4\u63a5\u4f7f\u7528\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">4.3 \u65e5\u5e38\u4fee\u6539\u63d0\u4ea4\u6d41\u7a0b<\/h3>\n\n\n\n<p>\u65e5\u5e38\u5f00\u53d1\u4e2d\u6700\u5e38\u7528\u7684\u64cd\u4f5c\u6d41\u7a0b\uff0c\u7528\u4e8e\u5c06\u4ee3\u7801\u4fee\u6539\u540c\u6b65\u81f3\u672c\u5730\u4e0e\u8fdc\u7a0b\u4ed3\u5e93\u3002<\/p>\n\n\n\n<ol class=\"wp-block-list\">\n<li>\u67e5\u770b\u5f53\u524d\u4ed3\u5e93\u72b6\u6001\uff0c\u786e\u8ba4\u4fee\u6539\u7684\u6587\u4ef6\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>git status<\/code><\/pre>\n\n\n\n<ol start=\"2\" class=\"wp-block-list\">\n<li>\u67e5\u770b\u6587\u4ef6\u7684\u5177\u4f53\u4fee\u6539\u5185\u5bb9\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>git diff<\/code><\/pre>\n\n\n\n<ol start=\"3\" class=\"wp-block-list\">\n<li>\u5c06\u4fee\u6539\u7684\u6587\u4ef6\u6dfb\u52a0\u81f3\u6682\u5b58\u533a\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code># \u6dfb\u52a0\u6307\u5b9a\u4fee\u6539\u6587\u4ef6\ngit add \u6587\u4ef6\u540d\n# \u6dfb\u52a0\u6240\u6709\u4fee\u6539\u6587\u4ef6\ngit add .<\/code><\/pre>\n\n\n\n<ol start=\"4\" class=\"wp-block-list\">\n<li>\u63d0\u4ea4\u81f3\u672c\u5730\u4ed3\u5e93\uff0c\u751f\u6210\u7248\u672c\u8bb0\u5f55\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>git commit -m \"\u63d0\u4ea4\u8bf4\u660e\"<\/code><\/pre>\n\n\n\n<ol start=\"5\" class=\"wp-block-list\">\n<li>\u63a8\u9001\u672c\u5730\u63d0\u4ea4\u81f3\u8fdc\u7a0b\u4ed3\u5e93\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code># \u9996\u6b21\u63a8\u9001\uff0c\u9700\u8bbe\u7f6e\u672c\u5730\u5206\u652f\u4e0e\u8fdc\u7a0b\u5206\u652f\u7684\u5173\u8054\u5173\u7cfb\ngit push -u origin \u5206\u652f\u540d\n# \u5df2\u8bbe\u7f6e\u5173\u8054\u540e\u7684\u5e38\u89c4\u63a8\u9001\ngit push<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\">4.4 \u5206\u652f\u7ba1\u7406\u64cd\u4f5c<\/h3>\n\n\n\n<p>\u5206\u652f\u662fGit\u7684\u6838\u5fc3\u529f\u80fd\uff0c\u7528\u4e8e\u9694\u79bb\u4e0d\u540c\u7684\u5f00\u53d1\u4efb\u52a1\uff0c\u907f\u514d\u76f4\u63a5\u5728\u4e3b\u5206\u652f\u5f00\u53d1\u5bfc\u81f4\u4ee3\u7801\u4e0d\u7a33\u5b9a\u3002\u4e3b\u5206\u652f\uff08\u901a\u5e38\u4e3a<code>main<\/code>\u6216<code>master<\/code>\uff09\u7528\u4e8e\u5b58\u653e\u7a33\u5b9a\u53ef\u53d1\u5e03\u7684\u4ee3\u7801\uff0c\u529f\u80fd\u5f00\u53d1\u3001bug\u4fee\u590d\u9700\u5728\u72ec\u7acb\u5206\u652f\u5b8c\u6210\u540e\u518d\u5408\u5e76\u81f3\u4e3b\u5206\u652f\u3002<\/p>\n\n\n\n<ol class=\"wp-block-list\">\n<li>\u67e5\u770b\u5206\u652f\u5217\u8868\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code># \u67e5\u770b\u672c\u5730\u6240\u6709\u5206\u652f\uff0c\u5f53\u524d\u6240\u5728\u5206\u652f\u524d\u4f1a\u6807\u6ce8*\u7b26\u53f7\ngit branch\n# \u67e5\u770b\u8fdc\u7a0b\u6240\u6709\u5206\u652f\ngit branch -r\n# \u67e5\u770b\u6240\u6709\u672c\u5730\u4e0e\u8fdc\u7a0b\u5206\u652f\ngit branch -a<\/code><\/pre>\n\n\n\n<ol start=\"2\" class=\"wp-block-list\">\n<li>\u65b0\u5efa\u5206\u652f\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>git branch \u5206\u652f\u540d<\/code><\/pre>\n\n\n\n<p>\u57fa\u4e8e\u5f53\u524d\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4\u65b0\u5efa\u5206\u652f\u3002<\/p>\n\n\n\n<ol start=\"3\" class=\"wp-block-list\">\n<li>\u5207\u6362\u5206\u652f\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>git switch \u5206\u652f\u540d<\/code><\/pre>\n\n\n\n<p>\u65e7\u7248Git\u53ef\u4f7f\u7528<code>git checkout \u5206\u652f\u540d<\/code>\u5b9e\u73b0\u76f8\u540c\u6548\u679c\u3002<\/p>\n\n\n\n<ol start=\"4\" class=\"wp-block-list\">\n<li>\u65b0\u5efa\u5e76\u76f4\u63a5\u5207\u6362\u81f3\u65b0\u5206\u652f\uff08\u65e5\u5e38\u5f00\u53d1\u5e38\u7528\uff09\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>git switch -c \u5206\u652f\u540d<\/code><\/pre>\n\n\n\n<ol start=\"5\" class=\"wp-block-list\">\n<li>\u5408\u5e76\u5206\u652f\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>git merge \u5f85\u5408\u5e76\u5206\u652f\u540d<\/code><\/pre>\n\n\n\n<p>\u5c06\u6307\u5b9a\u5206\u652f\u7684\u4fee\u6539\u5408\u5e76\u81f3\u5f53\u524d\u6240\u5728\u5206\u652f\u3002\u4f8b\uff1a\u9700\u5c06<code>feature<\/code>\u5206\u652f\u5408\u5e76\u81f3<code>main<\/code>\u5206\u652f\u65f6\uff0c\u9700\u5148\u5207\u6362\u81f3<code>main<\/code>\u5206\u652f\uff0c\u518d\u6267\u884c<code>git merge feature<\/code>\u3002<\/p>\n\n\n\n<ol start=\"6\" class=\"wp-block-list\">\n<li>\u5220\u9664\u5206\u652f\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code># \u5220\u9664\u672c\u5730\u5df2\u5408\u5e76\u7684\u5206\u652f\ngit branch -d \u5206\u652f\u540d\n# \u5f3a\u5236\u5220\u9664\u672c\u5730\u672a\u5408\u5e76\u7684\u5206\u652f\ngit branch -D \u5206\u652f\u540d\n# \u5220\u9664\u8fdc\u7a0b\u5206\u652f\ngit push origin --delete \u5206\u652f\u540d<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\">4.5 \u8fdc\u7a0b\u4ee3\u7801\u62c9\u53d6<\/h3>\n\n\n\n<p>\u7528\u4e8e\u62c9\u53d6\u8fdc\u7a0b\u4ed3\u5e93\u7684\u6700\u65b0\u4ee3\u7801\uff0c\u540c\u6b65\u81f3\u672c\u5730\u5206\u652f\uff0c\u4fdd\u6301\u672c\u5730\u4ee3\u7801\u4e0e\u8fdc\u7a0b\u4e00\u81f4\u3002<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git pull<\/code><\/pre>\n\n\n\n<p>\u8be5\u547d\u4ee4\u4f1a\u81ea\u52a8\u62c9\u53d6\u5f53\u524d\u5206\u652f\u5bf9\u5e94\u8fdc\u7a0b\u5206\u652f\u7684\u6700\u65b0\u4ee3\u7801\uff0c\u5e76\u5408\u5e76\u81f3\u672c\u5730\u5206\u652f\uff0c\u7b49\u540c\u4e8e\u4f9d\u6b21\u6267\u884c<code>git fetch<\/code>\uff08\u62c9\u53d6\u8fdc\u7a0b\u4ee3\u7801\u4f46\u4e0d\u5408\u5e76\uff09\u4e0e<code>git merge<\/code>\u64cd\u4f5c\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">4.6 \u5408\u5e76\u51b2\u7a81\u5904\u7406<\/h3>\n\n\n\n<h4 class=\"wp-block-heading\">4.6.1 \u51b2\u7a81\u4ea7\u751f\u539f\u56e0<\/h4>\n\n\n\n<p>\u5f53\u4e24\u4e2a\u5206\u652f\u4fee\u6539\u4e86\u540c\u4e00\u6587\u4ef6\u7684\u540c\u4e00\u884c\u5185\u5bb9\uff0cGit\u65e0\u6cd5\u81ea\u52a8\u5224\u65ad\u9700\u4fdd\u7559\u7684\u5185\u5bb9\u65f6\uff0c\u4f1a\u4ea7\u751f\u5408\u5e76\u51b2\u7a81\uff0c\u9700\u624b\u52a8\u5904\u7406\u540e\u518d\u5b8c\u6210\u5408\u5e76\u3002<\/p>\n\n\n\n<h4 class=\"wp-block-heading\">4.6.2 \u51b2\u7a81\u5904\u7406\u6d41\u7a0b<\/h4>\n\n\n\n<ol class=\"wp-block-list\">\n<li>\u5408\u5e76\u6216\u62c9\u53d6\u4ee3\u7801\u89e6\u53d1\u51b2\u7a81\u540e\uff0c\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\u67e5\u770b\u6807\u8bb0\u4e3a<code>both modified<\/code>\u7684\u51b2\u7a81\u6587\u4ef6\u3002<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>git status<\/code><\/pre>\n\n\n\n<ol start=\"2\" class=\"wp-block-list\">\n<li>\u6253\u5f00\u51b2\u7a81\u6587\u4ef6\uff0cGit\u4f1a\u5728\u51b2\u7a81\u4f4d\u7f6e\u6dfb\u52a0\u5982\u4e0b\u6807\u8bb0\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\n\u5f53\u524d\u5206\u652f\u7684\u4ee3\u7801\u5185\u5bb9\n=======\n\u5f85\u5408\u5e76\u5206\u652f\u7684\u4ee3\u7801\u5185\u5bb9\n>>>>>>> \u5f85\u5408\u5e76\u5206\u652f\u540d<\/code><\/pre>\n\n\n\n<ol start=\"3\" class=\"wp-block-list\">\n<li>\u624b\u52a8\u7f16\u8f91\u51b2\u7a81\u6587\u4ef6\uff0c\u5220\u9664\u6240\u6709\u51b2\u7a81\u6807\u8bb0\uff0c\u4fdd\u7559\u6700\u7ec8\u9700\u8981\u7684\u4ee3\u7801\u5185\u5bb9\u3002<\/li>\n\n\n\n<li>\u51b2\u7a81\u5904\u7406\u5b8c\u6210\u540e\uff0c\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\uff0c\u5c06\u4fee\u6539\u540e\u7684\u6587\u4ef6\u6dfb\u52a0\u81f3\u6682\u5b58\u533a\u3002<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>git add \u51b2\u7a81\u6587\u4ef6<\/code><\/pre>\n\n\n\n<ol start=\"5\" class=\"wp-block-list\">\n<li>\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\uff0c\u5b8c\u6210\u5408\u5e76\u63d0\u4ea4\u3002<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>git commit -m \"fix: \u89e3\u51b3\u5408\u5e76\u51b2\u7a81\"<\/code><\/pre>\n\n\n\n<p>\u7406\u8bba\u8fd9\u4e00\u6bb5\u5728IDEA\u4f1a\u6709\u53ef\u89c6\u5316\u7a97\u53e3\u8fdb\u884c\u64cd\u4f5c<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">4.7 \u7248\u672c\u56de\u9000<\/h3>\n\n\n\n<p>\u7528\u4e8e\u5c06\u5f53\u524d\u5206\u652f\u56de\u9000\u81f3\u6307\u5b9a\u7684\u5386\u53f2\u7248\u672c\uff0c\u6062\u590d\u5386\u53f2\u4ee3\u7801\u72b6\u6001\u3002<\/p>\n\n\n\n<ol class=\"wp-block-list\">\n<li>\u67e5\u770b\u63d0\u4ea4\u5386\u53f2\uff0c\u83b7\u53d6\u76ee\u6807\u7248\u672c\u7684commit ID\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>git log<\/code><\/pre>\n\n\n\n<p>\u6267\u884c\u540e\u5c06\u6309\u65f6\u95f4\u5012\u5e8f\u5c55\u793a\u6240\u6709\u63d0\u4ea4\u8bb0\u5f55\uff0c\u5305\u62eccommit ID\u3001\u63d0\u4ea4\u4eba\u3001\u63d0\u4ea4\u65f6\u95f4\u3001\u63d0\u4ea4\u8bf4\u660e\uff0c\u53d6commit ID\u7684\u524d7\u4f4d\u5373\u53ef\u7528\u4e8e\u56de\u9000\u64cd\u4f5c\uff1b\u6309<code>q<\/code>\u53ef\u9000\u51fa\u65e5\u5fd7\u67e5\u770b\u3002<\/p>\n\n\n\n<ol start=\"2\" class=\"wp-block-list\">\n<li>\u6267\u884c\u7248\u672c\u56de\u9000\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code># \u8f6f\u56de\u9000\uff1a\u4ec5\u91cd\u7f6e\u63d0\u4ea4\u8bb0\u5f55\uff0c\u5dee\u5f02\u5185\u5bb9\u4fdd\u7559\u5728\u6682\u5b58\u533a\uff0c\u4e0d\u4f1a\u4e22\u5931\u4ee3\u7801\ngit reset --soft \u76ee\u6807commit ID\n# \u786c\u56de\u9000\uff1a\u5b8c\u5168\u91cd\u7f6e\u81f3\u76ee\u6807\u7248\u672c\uff0c\u540e\u7eed\u6240\u6709\u63d0\u4ea4\u4e0e\u4fee\u6539\u90fd\u4f1a\u88ab\u5220\u9664\uff0c\u9700\u8c28\u614e\u4f7f\u7528\ngit reset --hard \u76ee\u6807commit ID<\/code><\/pre>\n\n\n\n<ol start=\"3\" class=\"wp-block-list\">\n<li>\u82e5\u9700\u5c06\u56de\u9000\u540e\u7684\u7248\u672c\u540c\u6b65\u81f3\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u6267\u884c\u5f3a\u5236\u63a8\u9001\uff1a<\/li>\n<\/ol>\n\n\n\n<pre class=\"wp-block-code\"><code>git push -f<\/code><\/pre>\n\n\n\n<p>\u5f3a\u5236\u63a8\u9001\u4f1a\u8986\u76d6\u8fdc\u7a0b\u4ed3\u5e93\u7684\u5bf9\u5e94\u5206\u652f\uff0c\u4ec5\u53ef\u5728\u4e2a\u4eba\u4e13\u5c5e\u5206\u652f\u4f7f\u7528\uff0c\u7981\u6b62\u5728\u56e2\u961f\u5171\u7528\u7684\u4e3b\u5206\u652f\u6267\u884c\u8be5\u64cd\u4f5c\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">4.8 \u4e34\u65f6\u4fee\u6539\u6682\u5b58<\/h3>\n\n\n\n<p>\u7528\u4e8e\u4e34\u65f6\u4fdd\u5b58\u5de5\u4f5c\u533a\u672a\u5b8c\u6210\u7684\u4fee\u6539\uff0c\u65e0\u9700\u63d0\u4ea4\u5373\u53ef\u5207\u6362\u5206\u652f\u6267\u884c\u5176\u4ed6\u64cd\u4f5c\uff0c\u5904\u7406\u5b8c\u6210\u540e\u53ef\u6062\u590d\u4e4b\u524d\u7684\u4fee\u6539\u3002<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u6682\u5b58\u5f53\u524d\u6240\u6709\u4fee\u6539\ngit stash\n# \u67e5\u770b\u6240\u6709\u6682\u5b58\u8bb0\u5f55\ngit stash list\n# \u6062\u590d\u6700\u8fd1\u4e00\u6b21\u6682\u5b58\u7684\u4fee\u6539\uff0c\u5e76\u5220\u9664\u5bf9\u5e94\u7684\u6682\u5b58\u8bb0\u5f55\ngit stash pop\n# \u6062\u590d\u6307\u5b9a\u6682\u5b58\u8bb0\u5f55\uff0c\u4e0d\u5220\u9664\u6682\u5b58\u8bb0\u5f55\ngit stash apply \u6682\u5b58\u8bb0\u5f55\u540d\uff08\u5982stash@{0}\uff09\n# \u5220\u9664\u6240\u6709\u6682\u5b58\u8bb0\u5f55\ngit stash clear<\/code><\/pre>\n\n\n\n<h2 class=\"wp-block-heading\">\u4e94\u3001\u56e2\u961f\u534f\u4f5c\u6807\u51c6\u5de5\u4f5c\u6d41<\/h2>\n\n\n\n<p>\u672c\u89c4\u8303\u4e3a\u4e2d\u5c0f\u56e2\u961f\u901a\u7528\u7684Git\u534f\u4f5c\u6d41\u7a0b\uff0c\u53ef\u6709\u6548\u907f\u514d\u5206\u652f\u6df7\u4e71\u4e0e\u4ee3\u7801\u51b2\u7a81\uff0c\u4fdd\u969c\u4e3b\u5206\u652f\u4ee3\u7801\u7a33\u5b9a\uff0c\u65b0\u624b\u53ef\u76f4\u63a5\u53c2\u7167\u6267\u884c\uff1a<\/p>\n\n\n\n<ol class=\"wp-block-list\">\n<li>\u540c\u6b65\u4e3b\u5206\u652f\u6700\u65b0\u4ee3\u7801\uff1a\u5207\u6362\u81f3<code>main<\/code>\u4e3b\u5206\u652f\uff0c\u6267\u884c<code>git pull<\/code>\u62c9\u53d6\u8fdc\u7a0b\u6700\u65b0\u4ee3\u7801\uff0c\u786e\u4fdd\u672c\u5730\u4e3b\u5206\u652f\u4e3a\u6700\u65b0\u72b6\u6001\u3002<\/li>\n\n\n\n<li>\u65b0\u5efa\u5f00\u53d1\u5206\u652f\uff1a\u57fa\u4e8e\u6700\u65b0\u7684<code>main<\/code>\u5206\u652f\uff0c\u65b0\u5efa\u72ec\u7acb\u7684\u5f00\u53d1\u5206\u652f\uff0c\u5206\u652f\u547d\u540d\u9700\u6e05\u6670\u89c4\u8303\uff0c\u683c\u5f0f\u53c2\u8003\uff1a<code>feature\/\u529f\u80fd\u540d\u79f0<\/code>\uff08\u529f\u80fd\u5f00\u53d1\uff09\u3001<code>fix\/\u95ee\u9898\u63cf\u8ff0<\/code>\uff08bug\u4fee\u590d\uff09\u3001<code>hotfix\/\u7d27\u6025\u4fee\u590d\u5185\u5bb9<\/code>\uff08\u7ebf\u4e0a\u7d27\u6025\u4fee\u590d\uff09\u3002<\/li>\n\n\n\n<li>\u5206\u652f\u5f00\u53d1\u4e0e\u63d0\u4ea4\uff1a\u5728\u65b0\u5efa\u7684\u5f00\u53d1\u5206\u652f\u5b8c\u6210\u5f00\u53d1\uff0c\u6309\u529f\u80fd\u8282\u70b9\u63d0\u4ea4\u4ee3\u7801\uff0c\u63d0\u4ea4\u8bf4\u660e\u9700\u7b26\u5408\u89c4\u8303\uff0c\u6e05\u6670\u63cf\u8ff0\u4fee\u6539\u5185\u5bb9\u3002<\/li>\n\n\n\n<li>\u540c\u6b65\u4e3b\u5206\u652f\u4ee3\u7801\uff1a\u5f00\u53d1\u5b8c\u6210\u540e\uff0c\u5207\u6362\u81f3<code>main<\/code>\u5206\u652f\u62c9\u53d6\u6700\u65b0\u4ee3\u7801\uff0c\u518d\u5207\u6362\u56de\u5f00\u53d1\u5206\u652f\uff0c\u6267\u884c<code>git merge main<\/code>\uff0c\u5c06\u4e3b\u5206\u652f\u6700\u65b0\u4ee3\u7801\u5408\u5e76\u81f3\u5f00\u53d1\u5206\u652f\uff0c\u63d0\u524d\u5904\u7406\u5408\u5e76\u51b2\u7a81\u3002<\/li>\n\n\n\n<li>\u63a8\u9001\u5206\u652f\u4e0e\u63d0\u4ea4\u5408\u5e76\u8bf7\u6c42\uff1a\u5c06\u5f00\u53d1\u5206\u652f\u63a8\u9001\u81f3\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u5728\u4ee3\u7801\u6258\u7ba1\u5e73\u53f0\u63d0\u4ea4\u5408\u5e76\u8bf7\u6c42\uff08Pull Request\/Merge Request\uff0c\u7b80\u79f0PR\/MR\uff09\uff0c\u7ecf\u56e2\u961f\u4ee3\u7801\u5ba1\u6838\u901a\u8fc7\u540e\uff0c\u5408\u5e76\u81f3<code>main<\/code>\u4e3b\u5206\u652f\u3002<\/li>\n\n\n\n<li>\u5206\u652f\u6e05\u7406\uff1a\u5206\u652f\u5408\u5e76\u5b8c\u6210\u540e\uff0c\u5220\u9664\u672c\u5730\u4e0e\u8fdc\u7a0b\u5bf9\u5e94\u7684\u5f00\u53d1\u5206\u652f\uff0c\u907f\u514d\u5197\u4f59\u5206\u652f\u5806\u79ef\u3002<\/li>\n<\/ol>\n\n\n\n<h2 class=\"wp-block-heading\">\u516d\u3001\u4e3b\u6d41IDE\u7684\u53ef\u89c6\u5316Git\u64cd\u4f5c\u6307\u5357<\/h2>\n\n\n\n<p>\u672c\u7ae0\u8282\u7edf\u4e00\u8bf4\u660eVSCode\u4e0eIntelliJ IDEA\u7cfb\u5217IDE\u7684\u53ef\u89c6\u5316Git\u64cd\u4f5c\uff0c\u6240\u6709\u64cd\u4f5c\u5747\u5bf9\u5e94\u4e0a\u8ff0\u547d\u4ee4\u884c\u529f\u80fd\uff0c\u65b0\u624b\u53ef\u5728\u638c\u63e1\u6838\u5fc3\u903b\u8f91\u540e\uff0c\u901a\u8fc7\u53ef\u89c6\u5316\u64cd\u4f5c\u7b80\u5316\u6d41\u7a0b\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">6.1 VSCode\u53ef\u89c6\u5316\u64cd\u4f5c<\/h3>\n\n\n\n<p>VSCode\u5185\u7f6e\u539f\u751fGit\u652f\u6301\uff0c\u65e0\u9700\u989d\u5916\u5b89\u88c5\u63d2\u4ef6\u5373\u53ef\u5b8c\u6210\u5168\u6d41\u7a0bGit\u64cd\u4f5c\uff0c\u6838\u5fc3\u64cd\u4f5c\u5165\u53e3\u4e3a\u5de6\u4fa7\u6d3b\u52a8\u680f\u7684\u300c\u6e90\u4ee3\u7801\u7ba1\u7406\u300d\u9762\u677f\uff08\u5feb\u6377\u952e<code>Ctrl+Shift+G<\/code>\uff09\u3002<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><strong>\u4ed3\u5e93\u521d\u59cb\u5316<\/strong>\uff1a\u6253\u5f00\u9879\u76ee\u76ee\u5f55\u540e\uff0c\u5728\u300c\u6e90\u4ee3\u7801\u7ba1\u7406\u300d\u9762\u677f\u70b9\u51fb\u300c\u521d\u59cb\u5316\u5b58\u50a8\u5e93\u300d\uff0c\u5bf9\u5e94<code>git init<\/code>\u547d\u4ee4\u3002<\/li>\n\n\n\n<li><strong>\u6587\u4ef6\u6682\u5b58\u4e0e\u63d0\u4ea4<\/strong>\uff1a\u4fee\u6539\u7684\u6587\u4ef6\u4f1a\u5c55\u793a\u5728\u300c\u66f4\u6539\u300d\u5217\u8868\u4e2d\uff0c\u9f20\u6807\u60ac\u6d6e\u81f3\u6587\u4ef6\u4e0a\u70b9\u51fb\u300c+\u300d\u53f7\u5373\u53ef\u5c06\u6587\u4ef6\u6dfb\u52a0\u81f3\u6682\u5b58\u533a\uff08\u5bf9\u5e94<code>git add<\/code>\u547d\u4ee4\uff09\uff1b\u5728\u9762\u677f\u9876\u90e8\u7684\u8f93\u5165\u6846\u586b\u5199\u63d0\u4ea4\u8bf4\u660e\uff0c\u70b9\u51fb\u300c\u63d0\u4ea4\u300d\u6309\u94ae\u5373\u53ef\u5b8c\u6210\u672c\u5730\u63d0\u4ea4\uff08\u5bf9\u5e94<code>git commit<\/code>\u547d\u4ee4\uff09\u3002<\/li>\n\n\n\n<li><strong>\u5206\u652f\u7ba1\u7406<\/strong>\uff1a\u70b9\u51fb\u7f16\u8f91\u5668\u5de6\u4e0b\u89d2\u72b6\u6001\u680f\u7684\u5206\u652f\u540d\u79f0\uff0c\u53ef\u6253\u5f00\u5206\u652f\u7ba1\u7406\u9762\u677f\uff0c\u5b8c\u6210\u5206\u652f\u7684\u65b0\u5efa\u3001\u5207\u6362\u3001\u5220\u9664\u64cd\u4f5c\uff0c\u5bf9\u5e94<code>git branch<\/code>\u3001<code>git switch<\/code>\u7b49\u547d\u4ee4\u3002<\/li>\n\n\n\n<li><strong>\u62c9\u53d6\u4e0e\u63a8\u9001<\/strong>\uff1a\u300c\u6e90\u4ee3\u7801\u7ba1\u7406\u300d\u9762\u677f\u9876\u90e8\u7684\u300c\u2193 \u62c9\u53d6\u300d\u300c\u2191 \u63a8\u9001\u300d\u6309\u94ae\uff0c\u5bf9\u5e94<code>git pull<\/code>\u3001<code>git push<\/code>\u547d\u4ee4\uff1b\u72b6\u6001\u680f\u7684\u540c\u6b65\u56fe\u6807\u53ef\u540c\u65f6\u5b8c\u6210\u62c9\u53d6\u4e0e\u63a8\u9001\u64cd\u4f5c\u3002<\/li>\n\n\n\n<li><strong>\u51b2\u7a81\u5904\u7406<\/strong>\uff1a\u5408\u5e76\u89e6\u53d1\u51b2\u7a81\u540e\uff0c\u6253\u5f00\u51b2\u7a81\u6587\u4ef6\uff0cVSCode\u4f1a\u5728\u51b2\u7a81\u4f4d\u7f6e\u63d0\u4f9b\u5feb\u6377\u64cd\u4f5c\u6309\u94ae\uff0c\u53ef\u76f4\u63a5\u9009\u62e9\u300c\u63a5\u53d7\u5f53\u524d\u66f4\u6539\u300d\u300c\u63a5\u53d7\u4f20\u5165\u66f4\u6539\u300d\u300c\u63a5\u53d7\u53cc\u65b9\u66f4\u6539\u300d\u5b8c\u6210\u51b2\u7a81\u5904\u7406\uff0c\u5904\u7406\u5b8c\u6210\u540e\u6682\u5b58\u5e76\u63d0\u4ea4\u5373\u53ef\u3002<\/li>\n\n\n\n<li><strong>\u7248\u672c\u5386\u53f2\u4e0e\u56de\u9000<\/strong>\uff1a\u53ef\u5b89\u88c5\u300cGit History\u300d\u6269\u5c55\u63d2\u4ef6\uff0c\u5b89\u88c5\u540e\u53ef\u5728\u300c\u6e90\u4ee3\u7801\u7ba1\u7406\u300d\u9762\u677f\u6253\u5f00\u63d0\u4ea4\u5386\u53f2\u8bb0\u5f55\uff0c\u9009\u4e2d\u76ee\u6807\u63d0\u4ea4\u53ef\u6267\u884c\u7248\u672c\u56de\u9000\u64cd\u4f5c\uff0c\u5bf9\u5e94<code>git log<\/code>\u3001<code>git reset<\/code>\u547d\u4ee4\u3002<\/li>\n\n\n\n<li><strong>\u4e34\u65f6\u6682\u5b58\u4fee\u6539<\/strong>\uff1a\u5728\u300c\u6e90\u4ee3\u7801\u7ba1\u7406\u300d\u9762\u677f\u7684\u300c...\u300d\u66f4\u591a\u83dc\u5355\u4e2d\uff0c\u9009\u62e9\u300cStash\u300d\u76f8\u5173\u9009\u9879\uff0c\u5373\u53ef\u5b8c\u6210\u4fee\u6539\u7684\u6682\u5b58\u4e0e\u6062\u590d\uff0c\u5bf9\u5e94<code>git stash<\/code>\u7cfb\u5217\u547d\u4ee4\u3002<\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\">6.2 IntelliJ IDEA\u7cfb\u5217\u53ef\u89c6\u5316\u64cd\u4f5c<\/h3>\n\n\n\n<p>IntelliJ IDEA\u53ca\u540c\u7cfb\u5217\u7684WebStorm\u3001PyCharm\u3001GoLand\u7b49IDE\u5747\u5185\u7f6e\u4e86\u5b8c\u5584\u7684Git\u53ef\u89c6\u5316\u7ba1\u7406\u529f\u80fd\uff0c\u64cd\u4f5c\u903b\u8f91\u7edf\u4e00\uff0c\u6838\u5fc3\u64cd\u4f5c\u5165\u53e3\u4e3a\u9876\u90e8\u83dc\u5355\u680f\u7684\u300cGit\u300d\u9009\u9879\uff0c\u4ee5\u53ca\u5e95\u90e8\u5de5\u5177\u680f\u7684\u300cGit\u300d\u9762\u677f\u3002<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><strong>\u4ed3\u5e93\u521d\u59cb\u5316<\/strong>\uff1a\u6253\u5f00\u9879\u76ee\u540e\uff0c\u70b9\u51fb\u9876\u90e8\u83dc\u5355\u680f\u300cVCS\u300d-\u300cEnable Version Control Integration\u300d\uff0c\u5728\u5f39\u7a97\u4e2d\u9009\u62e9\u300cGit\u300d\u5373\u53ef\u5b8c\u6210\u4ed3\u5e93\u521d\u59cb\u5316\uff0c\u5bf9\u5e94<code>git init<\/code>\u547d\u4ee4\u3002<\/li>\n\n\n\n<li><strong>\u6587\u4ef6\u6682\u5b58\u4e0e\u63d0\u4ea4<\/strong>\uff1a\u4fee\u6539\u7684\u6587\u4ef6\u4f1a\u5728\u9879\u76ee\u89c6\u56fe\u4e2d\u4ee5\u989c\u8272\u6807\u8bb0\uff0c\u53f3\u952e\u70b9\u51fb\u9879\u76ee\u6216\u5bf9\u5e94\u6587\u4ef6\uff0c\u9009\u62e9\u300cGit\u300d-\u300cAdd\u300d\u5373\u53ef\u6dfb\u52a0\u81f3\u6682\u5b58\u533a\uff08\u5bf9\u5e94<code>git add<\/code>\u547d\u4ee4\uff09\uff1b\u70b9\u51fb\u9876\u90e8\u5de5\u5177\u680f\u7684\u300c\u221a \u63d0\u4ea4\u300d\u6309\u94ae\uff0c\u6216\u53f3\u952e\u9009\u62e9\u300cGit\u300d-\u300cCommit Directory\u300d\uff0c\u5728\u5f39\u7a97\u4e2d\u52fe\u9009\u63d0\u4ea4\u6587\u4ef6\u3001\u586b\u5199\u63d0\u4ea4\u8bf4\u660e\uff0c\u70b9\u51fb\u300c\u63d0\u4ea4\u300d\u5373\u53ef\u5b8c\u6210\u672c\u5730\u63d0\u4ea4\uff08\u5bf9\u5e94<code>git commit<\/code>\u547d\u4ee4\uff09\u3002<\/li>\n\n\n\n<li><strong>\u5206\u652f\u7ba1\u7406<\/strong>\uff1a\u70b9\u51fb\u7f16\u8f91\u5668\u53f3\u4e0b\u89d2\u72b6\u6001\u680f\u7684\u5206\u652f\u540d\u79f0\uff0c\u53ef\u6253\u5f00\u5206\u652f\u7ba1\u7406\u9762\u677f\uff0c\u5b8c\u6210\u5206\u652f\u7684\u65b0\u5efa\u3001\u68c0\u51fa\uff08\u5207\u6362\uff09\u3001\u5408\u5e76\u3001\u5220\u9664\u64cd\u4f5c\uff0c\u5bf9\u5e94<code>git branch<\/code>\u3001<code>git switch<\/code>\u3001<code>git merge<\/code>\u7b49\u547d\u4ee4\u3002<\/li>\n\n\n\n<li><strong>\u62c9\u53d6\u4e0e\u63a8\u9001<\/strong>\uff1a\u9876\u90e8\u5de5\u5177\u680f\u7684\u300c\u2193 \u62c9\u53d6\u300d\u300c\u2191 \u63a8\u9001\u300d\u6309\u94ae\uff0c\u5bf9\u5e94<code>git pull<\/code>\u3001<code>git push<\/code>\u547d\u4ee4\uff0c\u70b9\u51fb\u540e\u5728\u5f39\u7a97\u4e2d\u786e\u8ba4\u5bf9\u5e94\u5206\u652f\u5373\u53ef\u5b8c\u6210\u64cd\u4f5c\u3002<\/li>\n\n\n\n<li><strong>\u51b2\u7a81\u5904\u7406<\/strong>\uff1a\u5408\u5e76\u6216\u62c9\u53d6\u89e6\u53d1\u51b2\u7a81\u540e\uff0cIDE\u4f1a\u81ea\u52a8\u5f39\u51fa\u51b2\u7a81\u5904\u7406\u7a97\u53e3\uff0c\u7a97\u53e3\u5206\u4e3a\u4e09\u90e8\u5206\uff1a\u5de6\u4fa7\u4e3a\u672c\u5730\u5206\u652f\u4ee3\u7801\u3001\u53f3\u4fa7\u4e3a\u5f85\u5408\u5e76\u5206\u652f\u4ee3\u7801\u3001\u4e2d\u95f4\u4e3a\u6700\u7ec8\u5408\u5e76\u7ed3\u679c\uff0c\u70b9\u51fb\u4ee3\u7801\u65c1\u7684\u7bad\u5934\u53ef\u5c06\u5bf9\u5e94\u5185\u5bb9\u6dfb\u52a0\u81f3\u7ed3\u679c\u533a\uff0c\u7f16\u8f91\u5b8c\u6210\u540e\u70b9\u51fb\u300c\u5e94\u7528\u300d\u5373\u53ef\u5b8c\u6210\u51b2\u7a81\u5904\u7406\u3002<\/li>\n\n\n\n<li><strong>\u7248\u672c\u5386\u53f2\u4e0e\u56de\u9000<\/strong>\uff1a\u6253\u5f00\u5e95\u90e8\u300cGit\u300d\u9762\u677f\uff0c\u5207\u6362\u81f3\u300cLog\u300d\u6807\u7b7e\uff0c\u5373\u53ef\u67e5\u770b\u5b8c\u6574\u7684\u63d0\u4ea4\u5386\u53f2\uff0c\u53f3\u952e\u9009\u4e2d\u76ee\u6807\u63d0\u4ea4\uff0c\u9009\u62e9\u300c\u5c06\u5f53\u524d\u5206\u652f\u91cd\u7f6e\u5230\u6b64\u5904\u300d\uff0c\u5373\u53ef\u9009\u62e9\u5bf9\u5e94\u7684\u91cd\u7f6e\u6a21\u5f0f\u5b8c\u6210\u7248\u672c\u56de\u9000\uff0c\u5bf9\u5e94<code>git log<\/code>\u3001<code>git reset<\/code>\u547d\u4ee4\u3002<\/li>\n\n\n\n<li><strong>\u4e34\u65f6\u6682\u5b58\u4fee\u6539<\/strong>\uff1a\u53f3\u952e\u70b9\u51fb\u9879\u76ee\uff0c\u9009\u62e9\u300cGit\u300d-\u300cStash Changes\u300d\u5373\u53ef\u6682\u5b58\u5f53\u524d\u4fee\u6539\uff1b\u9009\u62e9\u300cGit\u300d-\u300cUnstash Changes\u300d\u5373\u53ef\u6062\u590d\u6682\u5b58\u7684\u4fee\u6539\uff0c\u5bf9\u5e94<code>git stash<\/code>\u7cfb\u5217\u547d\u4ee4\u3002<\/li>\n<\/ul>\n","protected":false},"excerpt":{"rendered":"<p>\u4e00\u3001\u6559\u7a0b\u6982\u8ff0 \u672c\u6559\u7a0b\u4e3aGit\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u7684\u65b0\u624b\u5165\u95e8\u6587\u6863\uff0c\u8986\u76d6Git\u6838\u5fc3\u539f\u7406\u3001\u5168\u91cf\u5e38\u7528\u547d\u4ee4\u884c\u64cd\u4f5c\uff0c\u540c\u65f6\u8865\u5145\u4e3b\u6d41\u96c6\u6210\u5f00\u53d1\u73af\u5883\uff08IDE\uff09 &#8230;<\/p>","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_jetpack_memberships_contains_paid_content":false,"footnotes":""},"categories":[2],"tags":[],"class_list":["post-39","post","type-post","status-publish","format-standard","hentry","category-2"],"jetpack_sharing_enabled":true,"jetpack_featured_media_url":"","_links":{"self":[{"href":"https:\/\/blog.baios.net\/index.php\/wp-json\/wp\/v2\/posts\/39","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/blog.baios.net\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/blog.baios.net\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/blog.baios.net\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/blog.baios.net\/index.php\/wp-json\/wp\/v2\/comments?post=39"}],"version-history":[{"count":3,"href":"https:\/\/blog.baios.net\/index.php\/wp-json\/wp\/v2\/posts\/39\/revisions"}],"predecessor-version":[{"id":43,"href":"https:\/\/blog.baios.net\/index.php\/wp-json\/wp\/v2\/posts\/39\/revisions\/43"}],"wp:attachment":[{"href":"https:\/\/blog.baios.net\/index.php\/wp-json\/wp\/v2\/media?parent=39"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blog.baios.net\/index.php\/wp-json\/wp\/v2\/categories?post=39"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blog.baios.net\/index.php\/wp-json\/wp\/v2\/tags?post=39"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}