{"id":7,"date":"2026-05-29T14:39:50","date_gmt":"2026-05-29T06:39:50","guid":{"rendered":"http:\/\/8.137.197.254\/?p=7"},"modified":"2026-05-29T14:40:56","modified_gmt":"2026-05-29T06:40:56","slug":"git%e4%bb%a3%e7%a0%81%e6%8f%90%e4%ba%a4%e5%92%8c%e8%a7%84%e8%8c%83","status":"publish","type":"post","link":"https:\/\/wanyi.art\/index.php\/2026\/05\/29\/git%e4%bb%a3%e7%a0%81%e6%8f%90%e4%ba%a4%e5%92%8c%e8%a7%84%e8%8c%83\/","title":{"rendered":"git\u4ee3\u7801\u63d0\u4ea4\u548c\u89c4\u8303"},"content":{"rendered":"\n

\u5e38\u7528\u547d\u4ee4\u96c6<\/strong><\/p>\n\n\n\n

\"\"<\/figure>\n\n\n\n

<\/p>\n\n\n\n

\u62c9\u53d6+\u63a8\u9001\u7684\u4ee3\u7801<\/h1>\n\n\n\n

1.\u628a\u6240\u6709\u4fee\u6539\u3001\u5220\u9664\u3001\u65b0\u589e\u7684\u4ee3\u7801\u6dfb\u52a0\u5230\u672c\u5730\u4ed3\u5e93<\/h1>\n\n\n\n
git add . <\/pre>\n\n\n\n
2.\u628a\u672c\u5730\u6682\u5b58\u533a\u7684\u4ee3\u7801\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93<\/h1>\n\n\n\n
git commit -m \"feat:XXXXX\"<\/pre>\n\n\n\n
3.\u62c9\u53d6\u8fdc\u7a0b\u4ee3\u7801<\/h1>\n\n\n\n
git pull origin dev<\/pre>\n\n\n\n
4.\u770b\u662f\u5426\u6709\u51b2\u7a81\uff08\u6709\u51b2\u7a81\u770b\u7b2c\u4e94\u6b65\uff0c\u6ca1\u6709\u770b\u7b2c\u4e03\u6b65\uff09<\/h1>\n\n\n\n
git status
\u200b
\u6709\u51b2\u7a81\u7684\u60c5\u51b5\uff1a\uff08\u7ea2\u8272 \/ \u9ad8\u4eae\uff09
Unmerged paths:
        both modified:   index.html   <-- \u8fd9\u4e2a\u5c31\u662f\u51b2\u7a81\u6587\u4ef6\uff01
\u200b
\u6ca1\u6709\u51b2\u7a81\u7684\u60c5\u51b5\uff1a
nothing to commit, working tree clean<\/pre>\n\n\n\n
5.\u89e3\u51b3\u51b2\u7a81<\/h1>\n\n\n\n
\u6839\u636e\u7ed9\u51fa\u7684\u51b2\u7a81\u6587\u4ef6\u8def\u5f84\uff0c\u4f7f\u7528vscode\u6253\u5f00\u9879\u76ee\uff0c\u627e\u5230\u5bf9\u5e94\u7684\u6587\u4ef6\uff0c\u5982\u4e0b\u6240\u793a\uff1a<\/p>\n\n\n\n
<<<<<<< HEAD    \ud83d\udc48 \u4f60\u7684\u5f53\u524d\u5206\u652f\u4ee3\u7801\uff08\u5f00\u5934\uff09
\u4f60\u7684\u4ee3\u7801
=======        \ud83d\udc48 \u5206\u9694\u7ebf\uff08\u4e2d\u95f4\uff09
\u522b\u4eba\u7684\u4ee3\u7801
>>>>>>> \u5206\u652f\u540d <\/pre>\n\n\n\n
6.\u6839\u636e\u81ea\u5df1\u7684\u5b9e\u9645\u60c5\u51b5\u5220\u9664\u4e0d\u9700\u8981\u7684\u4ee3\u7801\u5373\u53ef\u89e3\u51b3<\/h1>\n\n\n\n
7.\u628a\u4ee3\u7801\u8fd0\u884c\u4e00\u904d\uff0c\u770b\u770b\u81ea\u5df1\u7684\u9875\u9762\u548c\u522b\u4eba\u7684\u9875\u9762\u662f\u5426\u5b58\u5728<\/h1>\n\n\n\n
pnpm i \u6216
npm i
\u200b
npm run dev\u6216
pnpm run dev<\/pre>\n\n\n\n
8.\u63a8\u9001\u5230\u8fdc\u7a0b\u7684\u5206\u652f<\/h1>\n\n\n\n
git push origin \u5206\u652f\u540d<\/pre>\n\n\n\n
9.\u7533\u8bf7\u5408\u5e76\u5230dev\uff08\u5fc5\u987b\u9009\u62e9dev\u5206\u652f\u5408\u5e76\uff09<\/h1>\n\n\n\n
\u63d0\u4ea4\u4ee3\u7801\u89c4\u8303\u65b0\u89c4\uff1a<\/p>\n\n\n\n
1.\u5728\u521a\u5f00\u59cb\u5199\u4e00\u4e2a\u65b0\u9875\u9762\u7684\u65f6\u5019\u5efa\u7acb\u4e00\u4e2a\u5206\u652f\uff0c\u547d\u540d\u4e3afeature\/* \uff08\u91cc\u9762\u5fc5\u987b\u52a0\u59d3\u540d\u7b80\u5199\uff09<\/p>\n\n\n\n
2.\u628a\u672c\u5730\u7684\u4ee3\u7801\u63a8\u9001\u5230\u8be5\u5206\u652f<\/p>\n\n\n\n
3.\u6bcf\u5929\u4e0b\u73ed\u4e4b\u524d\u90fd\u63d0\u4ea4\u4e00\u6b21\u4ee3\u7801\u5230\u81ea\u5df1\u7684\u5206\u652f\u91cc\u9762<\/p>\n\n\n\n
4.\u5f53\u8be5\u9875\u9762\u5b8c\u6210\u7684\u65f6\u5019\uff0c\u5c31\u7533\u8bf7\u5408\u5e76\u5230dev<\/p>\n\n\n\n
<\/p>\n","protected":false},"excerpt":{"rendered":"
\u5e38\u7528\u547d\u4ee4\u96c6 \u62c9\u53d6+\u63a8\u9001\u7684\u4ee3\u7801 1.\u628a\u6240\u6709 […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"site-sidebar-layout":"default","site-content-layout":"","ast-site-content-layout":"default","site-content-style":"default","site-sidebar-style":"default","ast-global-header-display":"","ast-banner-title-visibility":"","ast-main-header-display":"","ast-hfb-above-header-display":"","ast-hfb-below-header-display":"","ast-hfb-mobile-header-display":"","site-post-title":"","ast-breadcrumbs-content":"","ast-featured-img":"","footer-sml-layout":"","ast-disable-related-posts":"","theme-transparent-header-meta":"","adv-header-id-meta":"","stick-header-meta":"","header-above-stick-meta":"","header-main-stick-meta":"","header-below-stick-meta":"","astra-migrate-meta-layouts":"default","ast-page-background-enabled":"default","ast-page-background-meta":{"desktop":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"tablet":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"mobile":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""}},"ast-content-background-meta":{"desktop":{"background-color":"var(--ast-global-color-4)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"tablet":{"background-color":"var(--ast-global-color-4)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"mobile":{"background-color":"var(--ast-global-color-4)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""}},"footnotes":""},"categories":[2],"tags":[],"class_list":["post-7","post","type-post","status-publish","format-standard","hentry","category-git"],"views":6,"_links":{"self":[{"href":"https:\/\/wanyi.art\/index.php\/wp-json\/wp\/v2\/posts\/7","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/wanyi.art\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/wanyi.art\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/wanyi.art\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/wanyi.art\/index.php\/wp-json\/wp\/v2\/comments?post=7"}],"version-history":[{"count":3,"href":"https:\/\/wanyi.art\/index.php\/wp-json\/wp\/v2\/posts\/7\/revisions"}],"predecessor-version":[{"id":13,"href":"https:\/\/wanyi.art\/index.php\/wp-json\/wp\/v2\/posts\/7\/revisions\/13"}],"wp:attachment":[{"href":"https:\/\/wanyi.art\/index.php\/wp-json\/wp\/v2\/media?parent=7"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/wanyi.art\/index.php\/wp-json\/wp\/v2\/categories?post=7"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/wanyi.art\/index.php\/wp-json\/wp\/v2\/tags?post=7"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}