{"id":1217,"date":"2025-12-22T15:46:37","date_gmt":"2025-12-22T07:46:37","guid":{"rendered":"https:\/\/wp.inskychen.com\/?p=1217"},"modified":"2025-12-22T15:46:37","modified_gmt":"2025-12-22T07:46:37","slug":"git-%e9%96%8b%e7%99%bc%e6%8c%87%e4%bb%a4%e9%80%9f%e6%9f%a5%e6%89%8b%e5%86%8a","status":"publish","type":"post","link":"https:\/\/wp.inskychen.com\/?p=1217","title":{"rendered":"Git \u958b\u767c\u6307\u4ee4\u901f\u67e5\u624b\u518a"},"content":{"rendered":"

<\/p>\n

\n

<\/p>\n

\n

Git \u958b\u767c\u6307\u4ee4\u901f\u67e5\u624b\u518a<\/h1>\n

VS Code \u74b0\u5883\u4e0b\u7684\u591a\u88dd\u7f6e (NAS\/Mac) \u5354\u4f5c\u6a19\u6e96\u4f5c\u696d\u7a0b\u5e8f<\/p>\n<\/p><\/div>\n

<\/p>\n

\n

\n \ud83d\udfe2<\/span> \u4e00\u3001\u65e5\u5e38\u958b\u767c\u6a19\u6e96\u6d41\u7a0b (SOP)
\n <\/h2>\n

1. \u958b\u5de5\u524d\u7684\u6e96\u5099 (\u5728\u958b\u59cb\u5beb code \u4e4b\u524d)<\/h3>\n

\u7121\u8ad6\u5728 A \u96fb\u8166\u9084\u662f B \u96fb\u8166\uff0c\u958b\u5de5\u524d\u52d9\u5fc5<\/strong>\u57f7\u884c\uff0c\u78ba\u4fdd\u57fa\u790e\u662f\u6700\u65b0\u7684\u3002<\/p>\n

# 1. \u78ba\u8a8d\u81ea\u5df1\u5728\u54ea\u500b\u5206\u652f (\u770b\u5230 * main \u624d\u662f\u6b63\u78ba)\ngit branch\n\n# 2. \u56de\u5230\u4e3b\u7dda\ngit checkout main\n\n# 3. \u4e0b\u8f09\u6700\u65b0\u9032\u5ea6\ngit pull\n\n# 4. (\u9078\u7528) \u66f4\u65b0\u96f2\u7aef\u5206\u652f\u6e05\u55ae (\u522a\u9664\u672c\u5730\u6b98\u5f71)\ngit fetch -p<\/code><\/pre>\n
2. \u958b\u767c\u65b0\u529f\u80fd (\u8d77\u624b\u5f0f)<\/h3>\n
\u7d55\u5c0d\u4e0d\u8981<\/strong>\u76f4\u63a5\u5728 main<\/code> \u4e0a\u4fee\u6539\u7a0b\u5f0f\u78bc\uff0c\u8acb\u958b\u65b0\u5206\u652f\u3002<\/p>\n
# \u5efa\u7acb\u4e26\u5207\u63db\u5230\u65b0\u5206\u652f\ngit checkout -b \u5206\u652f\u540d\u7a31\n# \u7bc4\u4f8b: git checkout -b feature-fuel-calc<\/code><\/pre>\n
3. \u5b58\u6a94\u8207\u4e0a\u50b3<\/h3>\n
\u505a\u5b8c\u4e00\u500b\u5c0f\u6bb5\u843d\u5c31\u53ef\u4ee5\u5b58\u6a94 (Commit)\u3002\u60a8\u53ef\u4ee5\u591a\u6b21 Commit<\/strong>\uff0c\u7b49\u5230\u4e00\u500b\u5927\u968e\u6bb5\u5b8c\u6210\u5f8c\u518d\u4e00\u6b21 Push\u3002<\/p>\n
# 1. \u52a0\u5165\u6240\u6709\u4fee\u6539\ngit add .\n\n# 2. \u63d0\u4ea4\u7248\u672c (\u9019\u662f\u5b58\u5728\u672c\u6a5f\uff0c\u53ef\u4ee5\u505a\u5f88\u591a\u6b21)\ngit commit -m \"\u5b8c\u6210\u5e73\u5747\u6cb9\u8017\u8a08\u7b97\u516c\u5f0f\"\n\n# --- \u60a8\u53ef\u4ee5\u91cd\u8907\u4e0a\u8ff0\u6b65\u9a5f 1 & 2 \u591a\u6b21\uff0c\u7d2f\u7a4d\u591a\u500b\u7248\u672c ---\n\n# 3. \u4e0a\u50b3\u5230\u96f2\u7aef (\u4e00\u6b21\u628a\u6240\u6709\u7d2f\u7a4d\u7684 commit \u63a8\u4e0a\u53bb)\n# (\u7b2c\u4e00\u6b21\u4e0a\u50b3\u8a72\u5206\u652f\u9700\u52a0 -u\uff0c\u4e4b\u5f8c\u76f4\u63a5 git push \u5373\u53ef)\ngit push -u origin \u5206\u652f\u540d\u7a31<\/code><\/pre>\n
\n            \ud83d\udca1 \u5c0f\u6280\u5de7\uff1a<\/strong> \u5728\u672c\u6a5f\u53ef\u4ee5\u76e1\u91cf\u983b\u7e41 Commit (\u5b58\u6a94)\uff0c\u9019\u6a23\u53ef\u4ee5\u96a8\u6642\u53cd\u6094\u56de\u5230\u4e0a\u4e00\u6b65\u3002\u4e0d\u7528\u64d4\u5fc3 Commit \u592a\u591a\uff0cGit Push \u6703\u4e00\u6b21\u628a\u6240\u6709\u7d2f\u7a4d\u7684\u9032\u5ea6\u50b3\u4e0a\u53bb\u3002\n        <\/div>\n
4. \u5408\u4f75\u56de\u4e3b\u7dda (\u529f\u80fd\u5b8c\u6210\u5f8c)<\/h3>\n
\u7576 feature-xxx<\/code> \u5206\u652f\u7684\u529f\u80fd\u5beb\u597d\u4e14\u6e2c\u8a66\u6c92\u554f\u984c\u4e86\u3002<\/p>\n
# 1. \u5207\u56de\u4e3b\u7dda\ngit checkout main\n\n# 2. \u518d\u6b21\u78ba\u4fdd\u4e3b\u7dda\u662f\u6700\u65b0\u7684 (\u4ee5\u9632\u5225\u4eba\u5728\u9019\u671f\u9593\u6709\u66f4\u65b0)\ngit pull\n\n# 3. \u5408\u4f75\u5206\u652f\ngit merge \u5206\u652f\u540d\u7a31\n\n# 4. \u63a8\u9001\u4e3b\u7dda\u5230\u96f2\u7aef\ngit push\n\n# 5. \u522a\u9664\u820a\u5206\u652f (\u6253\u6383\u6230\u5834)\ngit branch -d \u5206\u652f\u540d\u7a31<\/code><\/pre>\n<\/p><\/div>\n
    <\/p>\n
\n
\n            \ud83d\udd04<\/span> \u4e8c\u3001\u591a\u88dd\u7f6e\u5354\u4f5c (A \u96fb\u8166\u505a\u5b8c\uff0c\u63db B \u96fb\u8166)
\n        <\/h2>\n
\n            \u60c5\u5883\uff1a<\/strong> A \u96fb\u8166\u5df2\u7d93\u628a\u529f\u80fd\u5beb\u597d\u3001\u5408\u4f75\u56de main \u4e26\u63a8\u9001\u5230 GitHub \u4e86\u3002\u73fe\u5728\u6253\u958b B \u96fb\u8166\uff0c\u8981\u628a\u9032\u5ea6\u540c\u6b65\u904e\u4f86\u3002\n        <\/div>\n
B \u96fb\u8166\u64cd\u4f5c\u6b65\u9a5f\uff1a<\/h3>\n
    \n
  1. \n                \u6aa2\u67e5\u72c0\u614b<\/strong>\uff1a\u78ba\u8a8d\u76ee\u524d\u6c92\u6709\u672a\u5b58\u6a94\u7684\u4fee\u6539\u3002\n            <\/li>\n
  2. \n                \u5207\u56de\u4e3b\u7dda<\/strong>\uff1a<\/p>\n
    git checkout main<\/code><\/pre>\n<\/li>\n
  3. \n                \u540c\u6b65\u8cc7\u6599<\/strong>\uff1a<\/p>\n
    git pull<\/code><\/pre>\n
                    (\u73fe\u5728 B \u96fb\u8166\u7684 code \u5c31\u8ddf A \u96fb\u8166\u4e00\u6a23\u4e86)<\/span>\n            <\/li>\n
  4. \n                \u6e05\u7406\u820a\u5206\u652f<\/strong>\uff1a\u5982\u679c A \u96fb\u8166\u5df2\u7d93\u522a\u9664\u4e86\u67d0\u500b\u5206\u652f\uff0cB \u96fb\u8166\u53ef\u4ee5\u7528\u6b64\u6307\u4ee4\u540c\u6b65\u6e05\u55ae\uff1a<\/p>\n
    git fetch -p<\/code><\/pre>\n<\/li>\n<\/ol>\n
            <\/p>\n
    \n
    Q: A \u96fb\u8166\u63a8\u4e86\u65b0\u5206\u652f\uff0cB \u96fb\u8166 Pull \u6703\u767c\u751f\u4ec0\u9ebc\u4e8b\uff1f<\/h3>\n
    \u9019\u662f\u4e00\u500b\u5e38\u898b\u7684\u8aa4\u5340\uff01B \u96fb\u8166\u57f7\u884c git pull<\/code> \u5f8c\uff1a<\/p>\n
      \n
    • B \u96fb\u8166\u6703\u77e5\u9053<\/strong>\u6709\u65b0\u5206\u652f (Fetch \u6210\u529f)\u3002<\/li>\n
    • \u4f46 B \u96fb\u8166\u4e0d\u6703\u81ea\u52d5\u5207\u63db<\/strong>\u904e\u53bb\uff0c\u756b\u9762\u770b\u8d77\u4f86\u6c92\u8b8a\u5316 (\u9084\u662f\u5728 main)\u3002<\/li>\n<\/ul>\n
      B \u96fb\u8166\u82e5\u8981\u770b\u5230\u8a72\u5206\u652f\uff0c\u5fc5\u9808\u624b\u52d5\u5207\u63db\uff1a<\/p>\n
      git checkout \u65b0\u5206\u652f\u540d\u7a31<\/code><\/pre>\n<\/p><\/div>\n<\/p><\/div>\n
          <\/p>\n
      \n
      \n            \ud83d\udd34<\/span> \u4e09\u3001\u6551\u547d\u5c08\u5340 (\u932f\u8aa4\u6392\u9664)
      \n        <\/h2>\n
      \u72c0\u6cc1 A\uff1aPull \u6216 Checkout \u6642\u88ab\u62d2\u7d55<\/h3>\n
      \n            error: Your local changes … would be overwritten by merge\n        <\/div>\n
      \u539f\u56e0\uff1a<\/strong> \u60a8\u6709\u6a94\u6848 (index.php<\/code> \u6216\u5716\u7247) \u4fee\u6539\u4e86\u4f46\u6c92\u5b58\u6a94\uff0cGit \u4e0d\u6562\u8986\u84cb\u3002<\/p>\n
      \n
      \n                \u89e3\u6cd5 1\uff1a\u6211\u4e0d\u8981\u9019\u4e9b\u4fee\u6539\u4e86 (\u76f4\u63a5\u8986\u84cb)<\/strong><\/p>\n
        \n
      • VS Code \u64cd\u4f5c\uff1a<\/strong>\u5728\u5de6\u5074\u300c\u539f\u59cb\u78bc\u63a7\u5236\u300d\u5c0d\u8a72\u6a94\u6848\u6309\u53f3\u9375 -> Discard Changes (\u6368\u68c4\u8b8a\u66f4)<\/strong>\u3002<\/li>\n
      • \u6307\u4ee4\u64cd\u4f5c\uff1a<\/strong>git checkout .<\/code> (\u9084\u539f\u6240\u6709\u6a94\u6848)<\/li>\n<\/ul><\/div>\n
        \n                \u89e3\u6cd5 2\uff1a\u6211\u60f3\u4fdd\u7559\u4fee\u6539 (\u66ab\u5b58\u6cd5)<\/strong><\/p>\n
        git stash       # \u66ab\u5b58\ngit pull        # \u66f4\u65b0\ngit stash pop   # \u53d6\u56de\u66ab\u5b58<\/code><\/pre>\n<\/p><\/div>\n<\/p><\/div>\n
        \u72c0\u6cc1 B\uff1a\u4e0d\u5c0f\u5fc3\u9032\u5165 Detached HEAD<\/h3>\n
        \n            You are in ‘detached HEAD’ state\n        <\/div>\n
        \u539f\u56e0\uff1a<\/strong> \u60a8\u4f7f\u7528\u4e86 git checkout origin\/main<\/code> (\u932f\u8aa4\u6307\u4ee4)\uff0c\u8dd1\u5230\u4e86\u552f\u8b80\u7684\u96f2\u7aef\u6620\u50cf\u3002<\/p>\n
        # \u89e3\u6cd5\uff1a\u56de\u5230\u5730\u7403\u8868\u9762\ngit checkout main<\/code><\/pre>\n
        \u72c0\u6cc1 C\uff1a\u672c\u5730\u7aef\u5168\u4e82\u4e86\uff0c\u60f3\u5f37\u5236\u8ddf\u96f2\u7aef\u4e00\u6a23<\/h3>\n
        \n            \u26a0\ufe0f \u8b66\u544a\uff1a<\/strong> \u9019\u6703\u522a\u9664\u6240\u6709\u672a\u4e0a\u50b3\u7684\u4fee\u6539\uff0c\u8acb\u8b39\u614e\u4f7f\u7528\u3002\n        <\/div>\n
        \u60c5\u5883\uff1a<\/strong> \u653e\u68c4\u6cbb\u7642\uff0c\u6211\u8981\u8b93\u96fb\u8166\u88e1\u7684\u7a0b\u5f0f\u78bc\u8ddf GitHub \u4e0a \u4e00\u6a21\u4e00\u6a23<\/strong>\u3002<\/p>\n
        git fetch --all\ngit reset --hard origin\/main<\/code><\/pre>\n<\/p><\/div>\n
            <\/p>\n
        \n
        \n            \u2699\ufe0f<\/span> \u56db\u3001\u74b0\u5883\u8a2d\u5b9a (Mac \/ Docker)
        \n        <\/h2>\n
        \n
        \n
        1. Git \u8eab\u5206\u8a2d\u5b9a (\u65b0\u96fb\u8166\u5fc5\u505a)<\/h3>\n
        git config --global user.name \"\u60a8\u7684\u540d\u5b57\"\ngit config --global user.email \"\u60a8\u7684GitHub\u4fe1\u7bb1\"<\/code><\/pre>\n<\/p><\/div>\n
        \n
        2. Mac \u8a18\u4f4f\u5bc6\u78bc\u8a2d\u5b9a<\/h3>\n
        git config --global credential.helper osxkeychain<\/code><\/pre>\n<\/p><\/div>\n<\/p><\/div>\n
        3. Docker \u5e38\u7528\u6307\u4ee4 (\u6e2c\u8a66\u74b0\u5883)<\/h3>\n
        \u5728\u542b\u6709 docker-compose.yml<\/code> \u7684\u8cc7\u6599\u593e\u4e0b\u57f7\u884c\uff1a<\/p>\n
        # \u555f\u52d5\u74b0\u5883 (\u80cc\u666f\u57f7\u884c)\ndocker-compose up -d\n\n# \u505c\u6b62\u4e26\u79fb\u9664\u74b0\u5883\ndocker-compose down\n\n# \u4fee\u6539\u4e86\u8a2d\u5b9a\u6a94 (\u5982\u52a0\u5165 pdo_mysql) \u5f8c\u5f37\u5236\u91cd\u5efa\ndocker-compose up -d --build<\/code><\/pre>\n<\/p><\/div>\n
            <\/p>\n
        \n
        \n            \ud83d\udcdd<\/span> \u4e94\u3001VS Code \u5716\u5f62\u4ecb\u9762 vs \u6307\u4ee4\u5c0d\u7167\u8868
        \n        <\/h2>\n
        \n\n\n\n\n\n\n\n\n\n\n\n
        \u52d5\u4f5c<\/th>\n\u7d42\u7aef\u6a5f\u6307\u4ee4 (CLI)<\/th>\nVS Code \u4ecb\u9762\u64cd\u4f5c<\/th>\n<\/tr>\n<\/thead>\n
        \u5207\u63db\u5206\u652f<\/td>\ngit checkout main<\/td>\n\u9ede\u64ca\u5de6\u4e0b\u89d2\u5206\u652f\u540d\u7a31 -> \u9078\u64c7\u6e05\u55ae<\/td>\n<\/tr>\n
        \u5efa\u7acb\u5206\u652f<\/td>\ngit checkout -b new-branch<\/td>\n\u9ede\u64ca\u5de6\u4e0b\u89d2\u5206\u652f\u540d\u7a31 -> Create new branch<\/td>\n<\/tr>\n
        \u540c\u6b65 (Pull\/Push)<\/td>\ngit pull \/ git push<\/td>\n\u9ede\u64ca\u5de6\u4e0b\u89d2\u300c\ud83d\udd04\u300d\u6216\u662f\u300c\u2601\ufe0f\u300d\u5716\u793a<\/td>\n<\/tr>\n
        \u63d0\u4ea4 (Commit)<\/td>\ngit commit -m “msg”<\/td>\n\u5de6\u5074\u300c\u539f\u59cb\u78bc\u63a7\u5236\u300d -> \u8f38\u5165\u8a0a\u606f -> Commit<\/td>\n<\/tr>\n
        \u653e\u68c4\u4fee\u6539<\/td>\ngit checkout .<\/td>\n\u5c0d\u6a94\u6848\u6e05\u55ae\u6309\u53f3\u9375 -> Discard Changes<\/strong><\/td>\n<\/tr>\n
        \u770b\u7dda\u5716<\/td>\ngit log –graph<\/td>\n\u9ede\u64ca\u4e0b\u65b9\u72c0\u614b\u5217\u7684 Git Graph<\/strong> \u6309\u9215<\/td>\n<\/tr>\n
        \u66f4\u65b0\u5206\u652f\u6e05\u55ae<\/td>\ngit fetch -p<\/td>\n(Git Graph \u4ecb\u9762) \u53f3\u4e0a\u89d2\u91cd\u65b0\u6574\u7406\u6309\u9215<\/td>\n<\/tr>\n<\/tbody>\n<\/table><\/div>\n<\/p><\/div>\n