{"id":741,"date":"2025-07-15T08:23:07","date_gmt":"2025-07-15T00:23:07","guid":{"rendered":"https:\/\/blog.heartwarming.online\/?p=741"},"modified":"2025-07-15T08:23:10","modified_gmt":"2025-07-15T00:23:10","slug":"git%e5%b0%86%e8%87%aa%e5%b7%b1%e8%b4%9f%e8%b4%a3%e7%9a%84%e5%b7%a5%e4%bd%9c%e5%88%86%e6%94%af%e5%90%88%e5%b9%b6%e5%88%b0%e4%b8%bb%e5%88%86%e6%94%af","status":"publish","type":"post","link":"https:\/\/blog.heartwarming.online\/index.php\/2025\/07\/15\/git%e5%b0%86%e8%87%aa%e5%b7%b1%e8%b4%9f%e8%b4%a3%e7%9a%84%e5%b7%a5%e4%bd%9c%e5%88%86%e6%94%af%e5%90%88%e5%b9%b6%e5%88%b0%e4%b8%bb%e5%88%86%e6%94%af\/","title":{"rendered":"Git\u5c06\u81ea\u5df1\u8d1f\u8d23\u7684\u5de5\u4f5c\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5206\u652f"},"content":{"rendered":"\n

\u6b65\u9aa4\u4e00\uff1a\u786e\u4fdd\u4f60\u7684\u672c\u5730\u5206\u652f\u662f\u6700\u65b0\u7684<\/h3>\n\n\n\n

# \u786e\u4fdd\u5f53\u524d\u5728\u4f60\u7684\u529f\u80fd\u5206\u652f\u4e0a<\/em><\/p>\n\n\n\n

git checkout feature\/dev-code-fangyun<\/code><\/pre>\n\n\n\n
# \u62c9\u53d6\u8fdc\u7a0b\u4ed3\u5e93\u6700\u65b0\u53d8\u66f4<\/em><\/p>\n\n\n\n
git pull origin feature\/dev-code-fangyun<\/code><\/pre>\n\n\n\n
<\/canvas><\/canvas>\u539f\u7406\uff1a\u8fd9\u4e00\u6b65\u786e\u4fdd\u4f60\u7684\u672c\u5730\u5206\u652f\u5305\u542b\u6240\u6709\u8fdc\u7a0b\u4ed3\u5e93\u7684\u6700\u65b0\u63d0\u4ea4\uff0c\u907f\u514d\u540e\u7eed\u5408\u5e76\u65f6\u9057\u6f0f\u53d8\u66f4\u3002<\/p>\n\n\n\n
\u6b65\u9aa4\u4e8c\uff1a\u83b7\u53d6\u76ee\u6807\u5206\u652f\u7684\u6700\u65b0\u4ee3\u7801<\/h3>\n\n\n\n
# \u83b7\u53d6\u6240\u6709\u8fdc\u7a0b\u5206\u652f\u7684\u6700\u65b0\u4fe1\u606f<\/em><\/p>\n\n\n\n
git fetch origin<\/code><\/pre>\n\n\n\n
<\/canvas><\/canvas>\u539f\u7406\uff1afetch \u547d\u4ee4\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u4e0b\u8f7d\u6240\u6709\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4\u4fe1\u606f\uff0c\u4f46\u4e0d\u4f1a\u81ea\u52a8\u5408\u5e76\u3002\u8fd9\u8ba9\u4f60\u53ef\u4ee5\u5728\u5408\u5e76\u524d\u4e86\u89e3\u76ee\u6807\u5206\u652f\u7684\u6700\u65b0\u72b6\u6001\u3002<\/p>\n\n\n\n
\u6b65\u9aa4\u4e09\uff1a\u5207\u6362\u5230\u76ee\u6807\u5206\u652f\u5e76\u66f4\u65b0<\/h3>\n\n\n\n
# \u5207\u6362\u5230\u76ee\u6807\u5206\u652f<\/em><\/p>\n\n\n\n
git checkout feature\/dev<\/code><\/pre>\n\n\n\n
# \u786e\u4fdd\u76ee\u6807\u5206\u652f\u662f\u6700\u65b0\u7684<\/em><\/p>\n\n\n\n
git pull origin feature\/dev<\/code><\/pre>\n\n\n\n
<\/canvas><\/canvas>\u539f\u7406\uff1a\u5728\u5408\u5e76\u524d\uff0c\u4f60\u9700\u8981\u5148\u5207\u6362\u5230\u76ee\u6807\u5206\u652f\uff08feature\/dev\uff09\u5e76\u786e\u4fdd\u5b83\u662f\u6700\u65b0\u7684\u3002\u8fd9\u6837\u53ef\u4ee5\u907f\u514d\u5408\u5e76\u540e\u518d\u6b21\u62c9\u53d6\u65f6\u51fa\u73b0\u51b2\u7a81\u3002<\/p>\n\n\n\n
\u6b65\u9aa4\u56db\uff1a\u5c06\u4f60\u7684\u529f\u80fd\u5206\u652f\u5408\u5e76\u5230\u76ee\u6807\u5206\u652f<\/h3>\n\n\n\n
# \u5728feature\/dev\u5206\u652f\u4e0a\uff0c\u5408\u5e76\u4f60\u7684\u529f\u80fd\u5206\u652f<\/em><\/p>\n\n\n\n
# \u5728feature\/dev\u5206\u652f\u4e0a\uff0c\u5408\u5e76\u4f60\u7684\u529f\u80fd\u5206\u652f\u5e76\u6dfb\u52a0\u63d0\u4ea4\u4fe1\u606f\ngit merge feature\/dev-code-fangyun -m \"\u5408\u5e76\u4e3b\u9898\u7ba1\u7406\u529f\u80fd\uff1a\u6dfb\u52a0\u6811\u5f62\u7ed3\u6784\u3001\u652f\u6301\u90e8\u5206\u5b57\u6bb5\u66f4\u65b0\u548c\u4f18\u5316\u5220\u9664\u903b\u8f91\"<\/code><\/pre>\n\n\n\n
<\/canvas><\/canvas>\u539f\u7406\uff1amerge \u547d\u4ee4\u5c06\u6307\u5b9a\u5206\u652f\uff08\u4f60\u7684\u529f\u80fd\u5206\u652f\uff09\u7684\u6240\u6709\u63d0\u4ea4\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\uff08\u76ee\u6807\u5206\u652f\uff09\u3002Git \u4f1a\u81ea\u52a8\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5408\u5e76\u63d0\u4ea4\uff0c\u8bb0\u5f55\u8fd9\u4e24\u4e2a\u5206\u652f\u7684\u5386\u53f2\u3002<\/p>\n\n\n\n
\u6b65\u9aa4\u4e94\uff1a\u89e3\u51b3\u53ef\u80fd\u7684\u5408\u5e76\u51b2\u7a81<\/h3>\n\n\n\n
\u5982\u679c\u6709\u5408\u5e76\u51b2\u7a81\uff0cGit \u4f1a\u63d0\u793a\u4f60\u3002\u4f60\u9700\u8981\uff1a<\/p>\n\n\n\n
# \u67e5\u770b\u51b2\u7a81\u6587\u4ef6<\/em><\/p>\n\n\n\n
git status<\/code><\/pre>\n\n\n\n
# \u7f16\u8f91\u51b2\u7a81\u6587\u4ef6\uff0c\u89e3\u51b3\u51b2\u7a81<\/em><\/p>\n\n\n\n
# \u5728\u6587\u4ef6\u4e2d\u67e5\u627e <<<<<<, =======, >>>>>> \u6807\u8bb0\uff0c\u624b\u52a8\u89e3\u51b3\u51b2\u7a81<\/em><\/p>\n\n\n\n
# \u6807\u8bb0\u51b2\u7a81\u5df2\u89e3\u51b3<\/em><\/p>\n\n\n\n
git add <\u51b2\u7a81\u6587\u4ef6\u8def\u5f84><\/code><\/pre>\n\n\n\n
# \u5b8c\u6210\u5408\u5e76<\/em><\/p>\n\n\n\n
git commit<\/code><\/pre>\n\n\n\n
<\/canvas><\/canvas>\u539f\u7406\uff1a\u5f53\u4e24\u4e2a\u5206\u652f\u4fee\u6539\u4e86\u540c\u4e00\u6587\u4ef6\u7684\u540c\u4e00\u90e8\u5206\u65f6\uff0cGit \u65e0\u6cd5\u81ea\u52a8\u51b3\u5b9a\u4fdd\u7559\u54ea\u4e2a\u7248\u672c\uff0c\u8fd9\u65f6\u9700\u8981\u624b\u52a8\u89e3\u51b3\u51b2\u7a81\u3002Git \u4f1a\u5728\u51b2\u7a81\u6587\u4ef6\u4e2d\u7528\u7279\u6b8a\u6807\u8bb0\uff08<<<<<<<, =======, >>>>>>>\uff09\u6807\u793a\u4e0d\u540c\u7248\u672c\u7684\u5185\u5bb9\uff0c\u4f60\u9700\u8981\u7f16\u8f91\u6587\u4ef6\u4fdd\u7559\u6b63\u786e\u7684\u5185\u5bb9\u3002<\/p>\n\n\n\n
\u6b65\u9aa4\u516d\uff1a\u63a8\u9001\u5408\u5e76\u7ed3\u679c\u5230\u8fdc\u7a0b\u4ed3\u5e93<\/h3>\n\n\n\n
# \u63a8\u9001\u5408\u5e76\u540e\u7684\u76ee\u6807\u5206\u652f\u5230\u8fdc\u7a0b\u4ed3\u5e93<\/em><\/p>\n\n\n\n
git push origin feature\/dev<\/code><\/pre>\n\n\n\n
<\/canvas><\/canvas>\u539f\u7406\uff1apush \u547d\u4ee4\u5c06\u672c\u5730\u5206\u652f\u7684\u63d0\u4ea4\u4e0a\u4f20\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u4f7f\u8fdc\u7a0b\u5206\u652f\u4e0e\u672c\u5730\u5206\u652f\u540c\u6b65\u3002\u8fd9\u6837\uff0c\u4f60\u7684\u529f\u80fd\u5206\u652f\u7684\u53d8\u66f4\u5c31\u6b63\u5f0f\u5408\u5e76\u5230\u4e86\u9879\u76ee\u7684\u603b\u5206\u652f\u4e2d\u3002<\/p>\n\n\n\n
\u989d\u5916\u9009\u9879\uff1a\u4f7f\u7528 Pull Request\uff08\u63a8\u8350\uff09<\/h3>\n\n\n\n
\u5728\u5927\u591a\u6570\u56e2\u961f\u9879\u76ee\u4e2d\uff0c\u4e0d\u4f1a\u76f4\u63a5\u5408\u5e76\u5230\u4e3b\u5206\u652f\uff0c\u800c\u662f\u521b\u5efa Pull Request\uff08GitHub\uff09\u6216 Merge Request\uff08GitLab\uff09\uff1a<\/p>\n\n\n\n
    \n
  1. \u5728 GitHub\/GitLab \u4e0a\u521b\u5efa\u4e00\u4e2a\u4ece\u00a0feature\/dev-code-fangyun\u00a0\u5230\u00a0feature\/dev\u00a0\u7684 Pull Request<\/li>\n\n\n\n
  2. \u9080\u8bf7\u56e2\u961f\u6210\u5458\u5ba1\u6838\u4ee3\u7801<\/li>\n\n\n\n
  3. \u901a\u8fc7 Web \u754c\u9762\u5b8c\u6210\u5408\u5e76<\/li>\n<\/ol>\n\n\n\n
    \u539f\u7406\uff1aPull Request \u63d0\u4f9b\u4e86\u4e00\u4e2a\u4ee3\u7801\u5ba1\u6838\u7684\u8fc7\u7a0b\uff0c\u786e\u4fdd\u5408\u5e76\u7684\u4ee3\u7801\u8d28\u91cf\uff0c\u540c\u65f6\u4e5f\u4fbf\u4e8e\u56e2\u961f\u8ba8\u8bba\u548c\u8bb0\u5f55\u53d8\u66f4\u3002<\/p>\n\n\n\n
    \u5b8c\u6574\u6d41\u7a0b\u603b\u7ed3<\/h3>\n\n\n\n
    \u6574\u4e2a\u5408\u5e76\u8fc7\u7a0b\u9075\u5faa\u4ee5\u4e0b\u539f\u5219\uff1a<\/p>\n\n\n\n
      \n
    1. \u786e\u4fdd\u6240\u6709\u5206\u652f\u90fd\u662f\u6700\u65b0\u7684<\/li>\n\n\n\n
    2. \u5728\u76ee\u6807\u5206\u652f\u4e0a\u8fdb\u884c\u5408\u5e76\u64cd\u4f5c<\/li>\n\n\n\n
    3. \u89e3\u51b3\u53ef\u80fd\u7684\u51b2\u7a81<\/li>\n\n\n\n
    4. \u5c06\u7ed3\u679c\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93<\/li>\n<\/ol>\n\n\n\n
      \u8fd9\u4e9b\u6b65\u9aa4\u786e\u4fdd\u4e86\u5408\u5e76\u8fc7\u7a0b\u7684\u987a\u5229\u8fdb\u884c\uff0c\u5e76\u7ef4\u62a4\u4e86\u6e05\u6670\u7684\u63d0\u4ea4\u5386\u53f2\u3002<\/p>\n\n\n\n
      \u8865\u5145\uff1a<\/h2>\n\n\n\n
      Git\u7684\u9ed8\u8ba4\u6587\u672c\u7f16\u8f91\u5668\uff08\u901a\u5e38\u662fVim\u6216Vi\uff09\uff0c\u5b83\u6b63\u5728\u7b49\u4f60\u8f93\u5165\u5408\u5e76\u63d0\u4ea4\u4fe1\u606f\u3002\u4ee5\u4e0b\u662f\u4f60\u9700\u8981\u505a\u7684\uff1a<\/p>\n\n\n\n
        \n
      1. \u8f93\u5165\u5408\u5e76\u63d0\u4ea4\u4fe1\u606f\uff1a<\/li>\n<\/ol>\n\n\n\n
          \n
        • \u6309\u4e0b\u952e\u76d8\u4e0a\u7684\u00a0i\u00a0\u952e\u8fdb\u5165\u63d2\u5165\u6a21\u5f0f\uff08\u5c4f\u5e55\u5e95\u90e8\u53ef\u80fd\u4f1a\u663e\u793a”INSERT”\uff09<\/li>\n\n\n\n
        • \u5220\u9664\u6240\u6709\u4ee5\u00a0#\u00a0\u5f00\u5934\u7684\u6ce8\u91ca\u884c\uff08\u6216\u4fdd\u7559\u5b83\u4eec\uff0c\u56e0\u4e3aGit\u4f1a\u81ea\u52a8\u5ffd\u7565\uff09<\/li>\n\n\n\n
        • \u5728\u7b2c\u4e00\u884c\u8f93\u5165\u4f60\u7684\u5408\u5e76\u63d0\u4ea4\u4fe1\u606f\uff0c\u4f8b\u5982\uff1atextApply to ThemeAdminAP…\u00a0\u00a0\u00a0\u00a0\u00a0\u5408\u5e76\u4e3b\u9898\u7ba1\u7406\u529f\u80fd\uff1a\u6811\u5f62\u7ed3\u6784\u3001\u90e8\u5206\u5b57\u6bb5\u66f4\u65b0\u548c\u5220\u9664\u4f18\u5316<\/canvas><\/canvas><\/li>\n\n\n\n
        • \u5982\u679c\u9700\u8981\uff0c\u53ef\u4ee5\u6dfb\u52a0\u66f4\u591a\u8be6\u7ec6\u4fe1\u606f\uff0c\u6bcf\u884c\u4e00\u4e2a\u8981\u70b9\uff1atextApply to ThemeAdminAP…\u00a0\u00a0\u00a0\u00a0\u00a0–\u00a0\u5b9e\u73b0\u4e3b\u9898\u6811\u5f62\u7ed3\u6784API\u00a0\u00a0\u00a0\u00a0\u00a0–\u00a0\u652f\u6301\u4e3b\u9898\u90e8\u5206\u5b57\u6bb5\u66f4\u65b0\u00a0\u00a0\u00a0\u00a0\u00a0–\u00a0\u4f18\u5316\u4e3b\u9898\u5220\u9664\u903b\u8f91\uff0c\u6e05\u9664\u5173\u8054\u5f15\u7528\u00a0\u00a0\u00a0\u00a0\u00a0–\u00a0\u4fee\u590d\u4e3b\u9898\u6392\u5e8f\u529f\u80fd<\/canvas><\/canvas><\/li>\n<\/ul>\n\n\n\n
            \n
          1. \u4fdd\u5b58\u5e76\u9000\u51fa\uff1a<\/li>\n<\/ol>\n\n\n\n
              \n
            • \u6309\u4e0b\u00a0Esc\u00a0\u952e\u9000\u51fa\u63d2\u5165\u6a21\u5f0f<\/li>\n\n\n\n
            • \u8f93\u5165\u00a0:wq\u00a0\u7136\u540e\u6309\u00a0Enter\u00a0\u952e\uff08w\u8868\u793a\u5199\u5165\/\u4fdd\u5b58\uff0cq\u8868\u793a\u9000\u51fa\uff09<\/li>\n<\/ul>\n\n\n\n
              \u5982\u679c\u4f60\u4e0d\u719f\u6089Vim\/Vi\u7f16\u8f91\u5668\uff0c\u8fd9\u4e9b\u662f\u57fa\u672c\u64cd\u4f5c\uff1a<\/p>\n\n\n\n
                \n
              • i\u00a0– \u8fdb\u5165\u63d2\u5165\u6a21\u5f0f\uff0c\u53ef\u4ee5\u5f00\u59cb\u8f93\u5165\u6587\u672c<\/li>\n\n\n\n
              • Esc\u00a0– \u9000\u51fa\u63d2\u5165\u6a21\u5f0f\uff0c\u8fdb\u5165\u547d\u4ee4\u6a21\u5f0f<\/li>\n\n\n\n
              • :wq\u00a0– \u4fdd\u5b58\u5e76\u9000\u51fa<\/li>\n\n\n\n
              • :q!\u00a0– \u4e0d\u4fdd\u5b58\u9000\u51fa\uff08\u5982\u679c\u4f60\u60f3\u53d6\u6d88\u5408\u5e76\uff09<\/li>\n<\/ul>\n\n\n\n
                \u5b8c\u6210\u8fd9\u4e9b\u6b65\u9aa4\u540e\uff0cGit\u4f1a\u7ee7\u7eed\u6267\u884c\u5408\u5e76\u64cd\u4f5c\uff0c\u5e76\u4f7f\u7528\u4f60\u63d0\u4f9b\u7684\u4fe1\u606f\u4f5c\u4e3a\u5408\u5e76\u63d0\u4ea4\u7684\u63cf\u8ff0\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"
                \u6b65\u9aa4\u4e00\uff1a\u786e\u4fdd\u4f60\u7684\u672c\u5730\u5206\u652f\u662f\u6700\u65b0\u7684 # \u786e\u4fdd\u5f53\u524d\u5728\u4f60\u7684\u529f\u80fd\u5206\u652f\u4e0a # \u62c9\u53d6\u8fdc\u7a0b\u4ed3\u5e93\u6700\u65b0\u53d8\u66f4  […]<\/p>\n","protected":false},"author":1,"featured_media":742,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_jetpack_memberships_contains_paid_content":false,"footnotes":""},"categories":[17,18],"tags":[22],"class_list":["post-741","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-front","category-back","tag-git"],"jetpack_sharing_enabled":true,"jetpack_featured_media_url":"https:\/\/blog.heartwarming.online\/wp-content\/uploads\/2025\/07\/pexels-photo-11035539-1.jpeg","_links":{"self":[{"href":"https:\/\/blog.heartwarming.online\/index.php\/wp-json\/wp\/v2\/posts\/741","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/blog.heartwarming.online\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/blog.heartwarming.online\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/blog.heartwarming.online\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/blog.heartwarming.online\/index.php\/wp-json\/wp\/v2\/comments?post=741"}],"version-history":[{"count":1,"href":"https:\/\/blog.heartwarming.online\/index.php\/wp-json\/wp\/v2\/posts\/741\/revisions"}],"predecessor-version":[{"id":743,"href":"https:\/\/blog.heartwarming.online\/index.php\/wp-json\/wp\/v2\/posts\/741\/revisions\/743"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/blog.heartwarming.online\/index.php\/wp-json\/wp\/v2\/media\/742"}],"wp:attachment":[{"href":"https:\/\/blog.heartwarming.online\/index.php\/wp-json\/wp\/v2\/media?parent=741"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blog.heartwarming.online\/index.php\/wp-json\/wp\/v2\/categories?post=741"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blog.heartwarming.online\/index.php\/wp-json\/wp\/v2\/tags?post=741"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}