{"id":93,"date":"2026-08-01T15:41:08","date_gmt":"2026-08-01T07:41:08","guid":{"rendered":"https:\/\/www.chexy.net\/blog\/?p=93"},"modified":"2026-08-01T15:47:52","modified_gmt":"2026-08-01T07:47:52","slug":"git%e6%97%a5%e5%b8%b8%e4%bd%bf%e7%94%a8%e4%b8%ad%e7%9a%84%e4%b8%80%e4%ba%9b%e7%bb%8f%e9%aa%8c%e8%ae%b0%e5%bd%95","status":"publish","type":"post","link":"https:\/\/www.chexy.net\/blog\/?p=93","title":{"rendered":"GIT\u65e5\u5e38\u4f7f\u7528\u4e2d\u7684\u4e00\u4e9b\u7ecf\u9a8c\u8bb0\u5f55"},"content":{"rendered":"\n<h4 class=\"wp-block-heading\"><strong>1\u3001\u5728\u9519\u8bef\u7684\u5206\u652f\u4e0b\u4fee\u6539\u4e86\u6587\u4ef6\uff0c\u60f3\u5207\u6362\u5230\u6b63\u786e\u5206\u652f\u7684\u65f6\u5019\uff1a<\/strong><\/h4>\n\n\n\n<p class=\"wp-block-paragraph\">\u53ef\u4ee5\u5148\u628a\u4fee\u6539\u6682\u65f6\u4fdd\u5b58\u8d77\u6765\uff1agit stash push -u -m &#8220;\u6682\u5b58\u4fee\u6539&#8221;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5207\u6362\u5230\u6b63\u786e\u5206\u652f\u540e\u518d\u6062\u590d\uff1agit stash pop<\/p>\n\n\n\n<h4 class=\"wp-block-heading\">2\u3001\u5728dev\u5206\u652f\u505a\u4e86\u4e00\u5806\u5c0f\u63d0\u4ea4\u540e\u60f3\u5408\u5e76\u5230main\u5206\u652f\u4f5c\u4e3a\u4e00\u4e2a\u529f\u80fd\u63d0\u4ea4\u7684\u65f6\u5019\uff1a<\/h4>\n\n\n\n<p class=\"wp-block-paragraph\">\u53ef\u4ee5\u5207\u6362\u5230main\u5206\u652f\u540e\u6267\u884c\uff1agit merge &#8211;squash dev<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u89e3\u51b3\u51b2\u7a81\u540e\u63d0\u4ea4\u5373\u53ef\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><\/p>\n","protected":false},"excerpt":{"rendered":"<p>1\u3001\u5728\u9519\u8bef\u7684\u5206\u652f\u4e0b\u4fee\u6539\u4e86\u6587\u4ef6\uff0c\u60f3\u5207\u6362\u5230\u6b63\u786e\u5206\u652f\u7684\u65f6\u5019\uff1a \u53ef\u4ee5\u5148\u628a\u4fee\u6539\u6682\u65f6\u4fdd\u5b58\u8d77\u6765\uff1agit stash push [&hellip;]<\/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":[1],"tags":[],"class_list":["post-93","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"_links":{"self":[{"href":"https:\/\/www.chexy.net\/blog\/index.php?rest_route=\/wp\/v2\/posts\/93","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.chexy.net\/blog\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.chexy.net\/blog\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.chexy.net\/blog\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.chexy.net\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=93"}],"version-history":[{"count":3,"href":"https:\/\/www.chexy.net\/blog\/index.php?rest_route=\/wp\/v2\/posts\/93\/revisions"}],"predecessor-version":[{"id":96,"href":"https:\/\/www.chexy.net\/blog\/index.php?rest_route=\/wp\/v2\/posts\/93\/revisions\/96"}],"wp:attachment":[{"href":"https:\/\/www.chexy.net\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=93"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.chexy.net\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=93"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.chexy.net\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=93"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}