{"id":20374,"date":"2024-11-19T09:57:13","date_gmt":"2024-11-19T01:57:13","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20374\/"},"modified":"2024-11-19T09:57:13","modified_gmt":"2024-11-19T01:57:13","slug":"git%e4%bf%ae%e6%94%b9%e4%b8%b4%e6%97%b6%e4%bb%a3%e7%a0%81","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20374\/","title":{"rendered":"git\u4fee\u6539\u4e34\u65f6\u4ee3\u7801"},"content":{"rendered":"

\u5728\u5f00\u53d1\u8fc7\u7a0b\u4e2d\uff0c\u7ecf\u5e38\u4f1a\u9047\u5230\u9700\u8981\u8c03\u8bd5\u6216\u8005\u6d4b\u8bd5\u67d0\u4e2a\u7279\u5b9a\u7684\u529f\u80fd\uff0c\u8fd9\u5c31\u9700\u8981\u6211\u4eec\u53bb\u4fee\u6539\u4ee3\u7801\u6765\u6ee1\u8db3\u6211\u4eec\u7684\u9700\u6c42\u3002\u4f46\u662f\u8fd9\u65f6\u5019\u6211\u4eec\u53c8\u4e0d\u60f3\u5f71\u54cd\u5230\u5176\u4ed6\u4eba\u7684\u5de5\u4f5c\uff0c\u6216\u8005\u5bfc\u81f4\u4e00\u4e9b\u610f\u5916\u540e\u679c\u3002\u8fd9\u65f6\u5019\u6211\u4eec\u9700\u8981\u4f7f\u7528git\u6765\u4fee\u6539\u4e34\u65f6\u4ee3\u7801\uff0c\u4ee5\u8fbe\u5230\u4e0d\u7834\u574f\u539f\u4ee3\u7801\u5e76\u80fd\u591f\u5355\u72ec\u5904\u7406\u7684\u6548\u679c\u3002<\/p>\n

Git\u4f5c\u4e3a\u76ee\u524d\u6700\u6d41\u884c\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\u4e4b\u4e00\uff0c\u5728\u4ee3\u7801\u4fee\u6539\u65b9\u9762\u6709\u7740\u5f88\u591a\u9ad8\u7ea7\u529f\u80fd\u3002\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u5b83\u6765\u521b\u5efa\u4e34\u65f6\u5206\u652f\uff0c\u5e76\u5728\u8be5\u5206\u652f\u4e0b\u8fdb\u884c\u4ee3\u7801\u4fee\u6539\uff0c\u6700\u540e\u53ef\u4ee5\u5408\u5e76\u56de\u4e3b\u5206\u652f\u3002\u4e0b\u9762\u6211\u4eec\u5c31\u6765\u4ecb\u7ecd\u4e00\u4e0b\u5728Git\u4e0a\u4fee\u6539\u4e34\u65f6\u4ee3\u7801\u7684\u5177\u4f53\u64cd\u4f5c\u3002<\/p>\n

\u4e00\u3001\u521b\u5efa\u65b0\u5206\u652f<\/p>\n

\u4e3a\u4e86\u4e0d\u5f71\u54cd\u4e3b\u5206\u652f\uff0c\u6211\u4eec\u53ef\u4ee5\u5728Git\u4e0a\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5206\u652f\uff0c\u7528\u4e8e\u5728\u6b64\u5206\u652f\u4e0b\u8fdb\u884c\u4fee\u6539\u4ee3\u7801\u7684\u64cd\u4f5c\u3002<\/p>\n

    \n
  1. \u5207\u6362\u5230\u4e3b\u5206\u652f<\/li>\n<\/ol>\n

    \u5728\u8fdb\u884c\u4efb\u4f55\u64cd\u4f5c\u4e4b\u524d\uff0c\u6211\u4eec\u9700\u8981\u5148\u786e\u8ba4\u5f53\u524d\u5728\u4e3b\u5206\u652f\u3002<\/p>\n

    $ git checkout master<\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236    \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \n
    1. \u521b\u5efa\u65b0\u5206\u652f<\/li>\n<\/ol>\n
      \u521b\u5efa\u65b0\u7684\u5206\u652f\u53ef\u4ee5\u4f7f\u7528\u547d\u4ee4\uff1agit branch [\u65b0\u5206\u652f\u540d]\uff0c\u4f8b\u5982\u6211\u4eec\u9700\u8981\u521b\u5efa\u4e00\u4e2a\u53eb\u505a\u201ddev\u201d\u7684\u65b0\u5206\u652f\uff1a<\/p>\n
      $ git branch dev<\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \u521b\u5efa\u6210\u529f\u540e\u6211\u4eec\u53ef\u4ee5\u5207\u6362\u5230\u65b0\u5206\u652f\u6765\u8fdb\u884c\u4fee\u6539\u64cd\u4f5c\u3002<\/p>\n
      $ git checkout dev<\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \u4e8c\u3001\u5728\u65b0\u5206\u652f\u4e0a\u4fee\u6539\u4ee3\u7801<\/p>\n
      \u5728\u65b0\u5206\u652f\u4e0b\u6211\u4eec\u5c31\u53ef\u4ee5\u6109\u5feb\u5730\u4fee\u6539\u6211\u4eec\u9700\u8981\u4fee\u6539\u7684\u4ee3\u7801\u4e86\u3002\u5728\u4e00\u4e9b\u7b80\u5355\u7684\u4ee3\u7801\u4fee\u6539\u4e0b\uff0c\u53ef\u4ee5\u76f4\u63a5\u4f7f\u7528\u7f16\u8f91\u5668\u8fdb\u884c\u4fee\u6539\u3002\u5982\u679c\u9700\u8981\u6587\u4ef6\u7684\u65b0\u589e\u6216\u8005\u5220\u9664\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528git\u547d\u4ee4\u8fdb\u884c\u64cd\u4f5c\u3002<\/p>\n
        \n
      1. \u4fee\u6539\u6587\u4ef6<\/li>\n<\/ol>\n
        \u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u5e38\u89c4\u7684\u7f16\u8f91\u5668\uff08vim\u3001emacs\u3001sublime\u7b49\uff09\u6765\u4fee\u6539\u6587\u4ef6\u3002<\/p>\n
        $ vim somefile.txt<\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
          \n
        1. \u65b0\u589e\u6587\u4ef6<\/li>\n<\/ol>\n
          \u5728\u65b0\u5206\u652f\u4e0a\u53ef\u4ee5\u5f88\u65b9\u4fbf\u5730\u65b0\u589e\u6587\u4ef6\u3002\u4f7f\u7528git\u547d\u4ee4\u6dfb\u52a0\u6587\u4ef6\u5230\u5f53\u524d\u5206\u652f\u3002<\/p>\n
          $ git add newfile.txt<\/pre>\n
            \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
            \n
          1. \u5220\u9664\u6587\u4ef6<\/li>\n<\/ol>\n
            \u540c\u6837\u7684\uff0c\u5220\u9664\u6587\u4ef6\u4e5f\u53ef\u4ee5\u901a\u8fc7git\u547d\u4ee4\u6765\u5b9e\u73b0\u3002<\/p>\n
            $ git rm filetodelete.txt<\/pre>\n
              \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
            \u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u65b0\u589e\u548c\u5220\u9664\u6587\u4ef6\u53ea\u4f1a\u5728\u5f53\u524d\u5206\u652f\u4e0b\u751f\u6548\uff0c\u4e0d\u4f1a\u5f71\u54cd\u5230\u4e3b\u5206\u652f\u3002<\/p>\n
            \u4e09\u3001\u63d0\u4ea4\u4fee\u6539<\/p>\n
            \u5728\u6211\u4eec\u5b8c\u6210\u4e86\u5206\u652f\u4e0b\u7684\u4fee\u6539\u4e4b\u540e\uff0c\u6211\u4eec\u9700\u8981\u5c06\u4fee\u6539\u63d0\u4ea4\u5230\u5206\u652f\u7684\u4ee3\u7801\u5e93\u4e2d\u3002<\/p>\n
              \n
            1. \u6dfb\u52a0\u4fee\u6539<\/li>\n<\/ol>\n
              \u4f7f\u7528git add\u547d\u4ee4\u6765\u6dfb\u52a0\u4fee\u6539\u7684\u5185\u5bb9\u3002<\/p>\n
              $ git add somefile.txt\n$ git add newfile.txt\n$ git add filetodelete.txt<\/pre>\n
                \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
                \n
              1. \u63d0\u4ea4\u4fee\u6539<\/li>\n<\/ol>\n
                \u63a5\u7740\u6211\u4eec\u9700\u8981\u63d0\u4ea4\u4ee3\u7801\u3002<\/p>\n
                $ git commit -m \"Some meaningful message\"<\/pre>\n
                  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
                \u56db\u3001\u5c06\u4fee\u6539\u5408\u5e76\u56de\u4e3b\u5206\u652f<\/p>\n
                \u5728\u6211\u4eec\u5b8c\u6210\u4e86\u4fee\u6539\u4e4b\u540e\uff0c\u6211\u4eec\u9700\u8981\u5c06\u8fd9\u4e9b\u4fee\u6539\u5408\u5e76\u56de\u4e3b\u5206\u652f\u3002<\/p>\n
                  \n
                1. \u5207\u56de\u4e3b\u5206\u652f<\/li>\n<\/ol>\n
                  \u5728\u8fdb\u884c\u4efb\u4f55\u64cd\u4f5c\u4e4b\u524d\uff0c\u6211\u4eec\u9700\u8981\u5148\u786e\u8ba4\u5f53\u524d\u5728\u4e3b\u5206\u652f\u3002<\/p>\n
                  $ git checkout master<\/pre>\n
                    \u767b\u5f55\u540e\u590d\u5236    \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
                    \n
                  1. \u5408\u5e76\u5206\u652f<\/li>\n<\/ol>\n
                    \u73b0\u5728\u6211\u4eec\u9700\u8981\u628adev\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e0a\u3002<\/p>\n
                    $ git merge dev<\/pre>\n
                      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
                      \n
                    1. \u89e3\u51b3\u51b2\u7a81<\/li>\n<\/ol>\n
                      \u5728\u5408\u5e76\u5206\u652f\u7684\u8fc7\u7a0b\u4e2d\uff0c\u5f88\u53ef\u80fd\u4f1a\u53d1\u751f\u4ee3\u7801\u51b2\u7a81\u7684\u60c5\u51b5\u3002\u8fd9\u65f6\u5019\u6211\u4eec\u9700\u8981\u89e3\u51b3\u8fd9\u4e9b\u51b2\u7a81\u3002\u53ef\u4ee5\u4f7f\u7528\u7f16\u8f91\u5668\u6216\u8005Git\u81ea\u5e26\u7684\u56fe\u5f62\u5316\u5de5\u5177\u6765\u89e3\u51b3\u3002<\/p>\n
                      \u4e94\u3001\u603b\u7ed3<\/p>\n
                      Git\u662f\u4e00\u4e2a\u975e\u5e38\u5f3a\u5927\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u66f4\u597d\u5730\u7ba1\u7406\u4ee3\u7801\u4fee\u6539\u3002\u5728\u4fee\u6539\u4e34\u65f6\u4ee3\u7801\u65f6\uff0c\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7\u521b\u5efa\u5206\u652f\u548c\u5408\u5e76\u5206\u652f\u7684\u65b9\u5f0f\uff0c\u6765\u8fbe\u5230\u4fee\u6539\u5e76\u4fdd\u7559\u539f\u4ee3\u7801\u7684\u6548\u679c\u3002\u540c\u65f6\uff0cGit\u4e5f\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u89e3\u51b3\u4ee3\u7801\u51b2\u7a81\u7b49\u95ee\u9898\uff0c\u4f7f\u6211\u4eec\u7684\u5de5\u4f5c\u66f4\u52a0\u8f7b\u677e\u4e0e\u9ad8\u6548\u3002<\/p>\n
                      \u4ee5\u4e0a\u5c31\u662fgit\u4fee\u6539\u4e34\u65f6\u4ee3\u7801\u7684\u8be6\u7ec6\u5185\u5bb9\uff0c\u66f4\u591a\u8bf7\u5173\u6ce8\u7c73\u4e91\u5176\u5b83\u76f8\u5173\u6587\u7ae0\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"
                      \u5728\u5f00\u53d1\u8fc7\u7a0b\u4e2d\uff0c\u7ecf\u5e38\u4f1a\u9047\u5230\u9700\u8981\u8c03\u8bd5\u6216\u8005\u6d4b\u8bd5\u67d0\u4e2a\u7279\u5b9a\u7684\u529f\u80fd\uff0c\u8fd9\u5c31\u9700\u8981\u6211\u4eec\u53bb\u4fee\u6539\u4ee3\u7801\u6765\u6ee1\u8db3\u6211\u4eec\u7684\u9700\u6c42\u3002\u4f46\u662f\u8fd9\u65f6\u5019\u6211\u4eec\u53c8\u4e0d\u60f3\u5f71\u54cd\u5230\u5176\u4ed6\u4eba\u7684\u5de5\u4f5c\uff0c\u6216\u8005\u5bfc\u81f4\u4e00\u4e9b\u610f\u5916\u540e\u679c\u3002\u8fd9\u65f6\u5019\u6211\u4eec\u9700\u8981\u4f7f\u7528git\u6765\u4fee\u6539\u4e34\u65f6\u4ee3\u7801\uff0c\u4ee5\u8fbe\u5230\u4e0d\u7834\u574f\u539f\u4ee3\u7801\u5e76\u80fd\u591f\u5355\u72ec\u5904\u7406\u7684\u6548\u679c\u3002 Git\u4f5c\u4e3a\u76ee\u524d\u6700\u6d41\u884c\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\u4e4b\u4e00\uff0c\u5728\u4ee3\u7801\u4fee\u6539\u65b9\u9762\u6709\u7740\u5f88\u591a\u9ad8\u7ea7\u529f\u80fd\u3002\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u5b83\u6765\u521b\u5efa\u4e34\u65f6\u5206\u652f\uff0c\u5e76\u5728\u8be5\u5206\u652f\u4e0b\u8fdb\u884c\u4ee3\u7801\u4fee\u6539\uff0c\u6700\u540e\u53ef\u4ee5\u5408\u5e76\u56de\u4e3b\u5206\u652f\u3002\u4e0b\u9762\u6211\u4eec\u5c31\u6765\u4ecb\u7ecd\u4e00\u4e0b\u5728Git\u4e0a\u4fee\u6539\u4e34\u65f6\u4ee3\u7801\u7684\u5177\u4f53\u64cd\u4f5c\u3002 \u4e00\u3001\u521b\u5efa\u65b0\u5206\u652f \u4e3a\u4e86\u4e0d\u5f71\u54cd\u4e3b\u5206\u652f\uff0c\u6211\u4eec\u53ef\u4ee5\u5728Git\u4e0a\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5206\u652f\uff0c\u7528\u4e8e\u5728\u6b64\u5206\u652f\u4e0b\u8fdb\u884c\u4fee\u6539\u4ee3\u7801\u7684\u64cd\u4f5c\u3002 \u5207\u6362\u5230\u4e3b\u5206\u652f \u5728\u8fdb\u884c\u4efb\u4f55\u64cd\u4f5c\u4e4b\u524d\uff0c\u6211\u4eec\u9700\u8981\u5148\u786e\u8ba4\u5f53\u524d\u5728\u4e3b\u5206\u652f\u3002 $ git checkout master \u767b\u5f55\u540e\u590d\u5236 \u767b\u5f55\u540e\u590d\u5236 \u521b\u5efa\u65b0\u5206\u652f \u521b\u5efa\u65b0\u7684\u5206\u652f\u53ef\u4ee5\u4f7f\u7528\u547d\u4ee4\uff1agit branch [\u65b0\u5206\u652f\u540d]\uff0c\u4f8b\u5982\u6211\u4eec\u9700\u8981\u521b\u5efa\u4e00\u4e2a\u53eb\u505a\u201ddev\u201d\u7684\u65b0\u5206\u652f\uff1a $ git branch dev \u767b\u5f55\u540e\u590d\u5236 \u521b\u5efa\u6210\u529f\u540e\u6211\u4eec\u53ef\u4ee5\u5207\u6362\u5230\u65b0\u5206\u652f\u6765\u8fdb\u884c\u4fee\u6539\u64cd\u4f5c\u3002 $ git checkout dev \u767b\u5f55\u540e\u590d\u5236 \u4e8c\u3001\u5728\u65b0\u5206\u652f\u4e0a\u4fee\u6539\u4ee3\u7801 \u5728\u65b0\u5206\u652f\u4e0b\u6211\u4eec\u5c31\u53ef\u4ee5\u6109\u5feb\u5730\u4fee\u6539\u6211\u4eec\u9700\u8981\u4fee\u6539\u7684\u4ee3\u7801\u4e86\u3002\u5728\u4e00\u4e9b\u7b80\u5355\u7684\u4ee3\u7801\u4fee\u6539\u4e0b\uff0c\u53ef\u4ee5\u76f4\u63a5\u4f7f\u7528\u7f16\u8f91\u5668\u8fdb\u884c\u4fee\u6539\u3002\u5982\u679c\u9700\u8981\u6587\u4ef6\u7684\u65b0\u589e\u6216\u8005\u5220\u9664\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528git\u547d\u4ee4\u8fdb\u884c\u64cd\u4f5c\u3002 \u4fee\u6539\u6587\u4ef6 \u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u5e38\u89c4\u7684\u7f16\u8f91\u5668\uff08vim\u3001emacs\u3001sublime\u7b49\uff09\u6765\u4fee\u6539\u6587\u4ef6\u3002 $ vim somefile.txt \u767b\u5f55\u540e\u590d\u5236 \u65b0\u589e\u6587\u4ef6 \u5728\u65b0\u5206\u652f\u4e0a\u53ef\u4ee5\u5f88\u65b9\u4fbf\u5730\u65b0\u589e\u6587\u4ef6\u3002\u4f7f\u7528git\u547d\u4ee4\u6dfb\u52a0\u6587\u4ef6\u5230\u5f53\u524d\u5206\u652f\u3002 $ git add newfile.txt \u767b\u5f55\u540e\u590d\u5236 \u5220\u9664\u6587\u4ef6 \u540c\u6837\u7684\uff0c\u5220\u9664\u6587\u4ef6\u4e5f\u53ef\u4ee5\u901a\u8fc7git\u547d\u4ee4\u6765\u5b9e\u73b0\u3002 $ git rm filetodelete.txt \u767b\u5f55\u540e\u590d\u5236 \u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u65b0\u589e\u548c\u5220\u9664\u6587\u4ef6\u53ea\u4f1a\u5728\u5f53\u524d\u5206\u652f\u4e0b\u751f\u6548\uff0c\u4e0d\u4f1a\u5f71\u54cd\u5230\u4e3b\u5206\u652f\u3002 \u4e09\u3001\u63d0\u4ea4\u4fee\u6539 \u5728\u6211\u4eec\u5b8c\u6210\u4e86\u5206\u652f\u4e0b\u7684\u4fee\u6539\u4e4b\u540e\uff0c\u6211\u4eec\u9700\u8981\u5c06\u4fee\u6539\u63d0\u4ea4\u5230\u5206\u652f\u7684\u4ee3\u7801\u5e93\u4e2d\u3002 \u6dfb\u52a0\u4fee\u6539 \u4f7f\u7528git add\u547d\u4ee4\u6765\u6dfb\u52a0\u4fee\u6539\u7684\u5185\u5bb9\u3002 […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[16],"tags":[],"class_list":["post-20374","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20374","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/comments?post=20374"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20374\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20374"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20374"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20374"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}