浣跨敤git鐨勬椂鍊欙紝鎴戜滑寰寰浣跨敤branch瑙ｅ喅浠誨姟鍒囨崲闂錛屼緥濡傦紝鎴戜滑寰寰浼?xì)寰忎竴涓嚜宸辯殑鍒嗘敮鍘諱慨鏀瑰拰璋冭瘯浠ｇ爜, 濡傛灉鍒漢鎴栬呰嚜宸卞彂鐜板師鏈夌殑鍒嗘敮涓婃湁涓笉寰椾笉淇敼鐨刡ug錛屾垜浠線寰浼?xì)鎶婂畬鎴愪竴鍗婄殑浠ｇ爜 commit鎻愪氦鍒版湰鍦頒粨搴擄紝鐒跺悗鍒囨崲鍒嗘敮鍘諱慨鏀筨ug錛屾敼濂戒箣鍚庡啀鍒囨崲鍥炴潵銆傝繖鏍風(fēng)殑璇濆線寰log涓婁細(xì)鏈夊ぇ閲忎笉蹇呰鐨勮褰曘傚叾瀹炲鏋滄垜浠笉鎯蟲(chóng)彁浜ゅ畬鎴愪竴鍗婃垨鑰呬笉瀹屽杽鐨勪唬鐮侊紝浣嗘槸鍗翠笉寰椾笉鍘諱慨鏀逛竴涓揣鎬ug錛岄偅涔堜嬌鐢?/span>'git stash'灝卞彲浠ュ皢浣犲綋鍓嶆湭鎻愪氦鍒版湰鍦幫紙鍜屾湇鍔″櫒錛夌殑浠ｇ爜鎺ㄥ叆鍒癎it鐨勬爤涓紝榪欐椂鍊欎綘鐨勫伐浣滃尯闂村拰涓婁竴嬈℃彁浜ょ殑鍐呭鏄畬鍏ㄤ竴鏍風(fēng)殑錛屾墍浠ヤ綘鍙互鏀懼績(jī)鐨勪慨 Bug錛岀瓑鍒頒慨瀹孊ug錛屾彁浜ゅ埌鏈嶅姟鍣ㄤ笂鍚庯紝鍐嶄嬌鐢?/span>'git stash apply'灝嗕互鍓嶄竴鍗婄殑宸ヤ綔搴旂敤鍥炴潵銆備篃璁告湁鐨勪漢浼?xì)璇村Q岄偅鎴戝彲涓嶅彲浠ュ嬈″皢鏈彁浜ょ殑浠ｇ爜鍘嬪叆鍒版爤涓紵絳旀鏄彲浠ョ殑銆傚綋浣犲嬈′嬌鐢?/span>'git stash'鍛戒護(hù)鍚庯紝浣犵殑鏍堥噷灝嗗厖婊′簡(jiǎn)鏈彁浜ょ殑浠ｇ爜錛岃繖鏃跺欎綘浼?xì)瀵篂畣鍝釜鐗堟湰搴旂敤鍥炴潵鏈変簺鍥版儜锛?/span>'git stash list'鍛戒護(hù)鍙互灝嗗綋鍓嶇殑Git鏍堜俊鎭墦鍗板嚭鏉ワ紝浣犲彧闇瑕佸皢鎵懼埌瀵瑰簲鐨勭増鏈彿錛屼緥濡備嬌鐢?/span>'git stash apply stash@{1}'灝卞彲浠ュ皢浣犳寚瀹氱増鏈彿涓簊tash@{1}鐨勫伐浣滃彇鍑烘潵錛屽綋浣犲皢鎵鏈夌殑鏍堥兘搴旂敤鍥炴潵鐨勬椂鍊欙紝鍙互浣跨敤'git stash clear'鏉ュ皢鏍堟竻絀恒?br />鍦ㄨ繖閲岄『渚挎彁涓媑it format-patch -n , n鏄叿浣撴煇涓暟瀛楋紝 渚嬪 'git format-patch -1' 榪欐椂渚夸細(xì)鏍規(guī)嵁log鐢熸垚涓涓搴旂殑琛ヤ竵錛屽鏋?nbsp;'git format-patch -2' 閭ｄ箞渚夸細(xì)鐢熸垚2涓ˉ涓侊紝褰撶劧鍓嶆彁鏄綘鐨刲og涓婃湁鑷沖皯鏈変袱涓褰曘?/span>
鐪嬭繃涓婇潰鐨勪俊鎭紝灝卞彲浠ョ煡閬撲嬌鐢ㄥ満鍚堜簡(jiǎn)錛氬綋鍓嶅伐浣滃尯鍐呭宸茶淇敼錛屼絾鏄茍鏈畬鎴愩傝繖鏃禕oss鏉ヤ簡(jiǎn)錛岃鍓嶉潰鐨勫垎鏀笂闈㈡湁涓涓狟ug錛岄渶瑕佺珛鍗充慨澶嶃傚彲鏄垜鍙堜笉鎯蟲(chóng)彁浜ょ洰鍓嶇殑淇敼錛屽洜涓轟慨鏀規(guī)病鏈夊畬鎴愩備絾鏄紝涓嶆彁浜ょ殑璇濓紝鍙堟病鏈夊姙娉昪heckout鍒板墠闈㈢殑鍒嗘敮銆傛鏃剁敤Git Stash灝辯浉褰撲簬澶囦喚宸ヤ綔鍖轟簡(jiǎn)銆傜劧鍚庡湪Checkout榪囧幓淇敼錛屽氨鑳藉杈懼埌淇濆瓨褰撳墠宸ヤ綔鍖猴紝騫跺強(qiáng)鏃舵仮澶嶇殑浣滅敤銆?br />
涓嬮潰錛屽皢鎴戜嬌鐢ㄨ繃紼嬩腑閬囧埌鐨勪竴涓棶棰樺拰澶у鍒嗕韓錛?br />
棣栧厛錛屽湪Git Stash涔嬪悗錛屾彁浜ゅ浘濡備笅鎵紺猴細(xì)
浠庡浘涓彲浠ョ湅鍒幫紝develop鍜宯ewdevelop鏄湪鍚屼竴涓垎鏀笂錛屽洜涓哄垎鏀痭ewdevelop鏄湪develop鍒嗘敮鐨勫熀紜涓婂紑鍙戠殑銆傛兂鍔犲叆涓涓柊鐨勭壒鎬э紝鎵浠ュ氨寮浜?jiǎn)newdevelop鍒嗘敮錛岀劧鍚庡氨鍦ㄤ笂闈㈠姞涓滆タ錛屽姞鐗規(guī)э紝璇ヤ唬鐮併傝繖涓椂鍊欏伐浣滅殑鍐呭宸茬粡鍙樺寲浜?jiǎn)锛屼絾鏄痙evelop鍜宯ewdevelop閮芥槸鎸囧悜鍚屼竴涓彁浜ょ殑錛屽洜涓簄ewdevelop涓婇潰榪樻湪鏈夋彁浜ゃ?br />榪欎釜鏃跺欙紝Boss鏉ヤ簡(jiǎn)錛岃develop涓婇潰鏈変釜Bug錛岃刀蹇敼涓涓嬶紝鎵嬪ご鐨勫伐浣滃厛鏀炬斁錛岀ǔ瀹氱増鏈笉鑳芥湁緙洪櫡銆傛病鍔炴硶錛屽綋鍓嶆鍦╪ewdevelop涓婃悶鐨刪igh鍛紝灝盙it Stash涓涓嬨傛墍浠ヤ細(xì)鐪嬪埌涓婇潰鏈変袱涓妭鐐癸紝綰㈣壊浠ュ強(qiáng)涓婇潰涓涓傚氨鏄痵tash涔嬪悗鐨勭粨鏋滐紝娉ㄦ剰鏄湪newdevelop涓婇潰榪涜鐨剆tash銆?br />
姝ｅ鍓嶉潰鎵璇達(dá)紝stash浼?xì)鏆傚瓨褰撳墠鐨勫伐浣滃尯鍐呭锛岀劧鍚帪畣宸ヤ綔鍖哄唴瀹逛繚鎸佸拰涓妺啤鎻愪氦鐩稿悓锛屾鏃跺唴瀹归兘鏄笂闈?a32閭ｄ釜鎻愪氦鐨勫唴瀹廣備粠緇堢涓煡鐪嬬浉搴旂殑淇℃伅鍐呭錛屽涓嬶細(xì)
鍗拌瘉浜?jiǎn)绛惧悕鐨勮娉曞Q宯ewdevelop鏄湁淇敼錛宮odified錛岀劧鍚巗tash涔嬪悗錛屽伐浣滃尯鏄渶榪戜竴嬈℃彁浜わ紝姝ゆ椂newdevelop鍜宒evelop閮芥槸鐩稿悓鐨勶紝鎵浠ュ啀git status鏌ョ湅鍙戠幇錛岄兘涓鏍鳳紝nothing to commit.
鐒跺悗Stash瀹屾垚涔嬪悗錛屽氨瑕丗ix Bug浜?jiǎn)銆備負(fù)姝わ紝鍥炲埌develop鍒嗘敮涓婅繘琛屼慨澶嶏紝鐒跺悗鎻愪氦錛屽畬鎴愬悗鐨勬彁浜ゅ浘濡備笅鎵紺猴細(xì)
鐒跺悗鍦╠evelop涓婇潰淇浜?jiǎn)Bug涔嬪悗錛屽湪鍥炲埌newdevelop涓婇潰榪涜涓涓柊鐨勭壒鎬х殑緇х畫緙栫爜錛屾鏃禼heckout鍥炲幓鐨勬椂鍊欙紝娌℃湁紲為┈鍐呭鍙互鎻愪氦錛屽洜涓洪兘瀛樺湪Stash涓簡(jiǎn)錛屾病鏈変換浣曚慨鏀廣傚涓婂浘銆?br />
閭ｄ箞錛屾仮澶嶅伐浣滃尯鍐呭鍚с備簬鏄痝it stash pop錛堟敞鎰忚繖閲岀敱浜庡彧Stash浜?jiǎn)涓嬈℃墍浠ヤ嬌鐢╬op錛屽叿浣撲綘瀛樻斁浜?jiǎn)澶殲畱锛岃鎭㈠鍝竴涓鑷繁娓呮錛屽惁鍒欎細(xì)鍑洪敊錛侊級(jí)
鎭㈠涔嬪悗錛屼粠涓婂浘涓彲浠ョ湅鍒幫紝姝ゆ椂鍐峠it status灝變細(xì)鍙戠幇鏂囦歡鏈変慨鏀癸紝璇存槑鎭㈠榪囨潵浜?jiǎn)銆傜劧鍚庡氨緇х畫緙栫爜錛屾彁浜や竴涓ǔ瀹氱殑鏂扮壒鎬х増鏈紝濡備笅鍥撅紝浜х敓鐨勬柊鎻愪氦涓?906.
鐒跺悗鍐嶆煡鐪嬫彁浜ゅ浘錛屼細(xì)鍙戠幇錛宻tash pop涔嬪悗錛屽搴旂殑瀛樻斁鐨剆tash琚竻絀烘帀浜?jiǎn)锛屾彁浜ゅ浘涓Q宯ewdevelop涓婇潰瀵瑰簲涓涓柊鐨勬彁浜ゃ傚茍涓斿湪develop涓婇潰銆傚垎鏀殑develop閭ｄ釜綰㈣壊錛屽嵆涓哄墠闈慨澶岯ug鐨勯偅涓彁浜ゃ?br />
鎬葷粨璧鋒潵錛?br />鎿嶄綔寰堢畝鍗曪紝浣嗘槸澶磋剳瑕佹竻妤氥傝鍦ㄥ摢涓垎鏀笂淇Bug錛岃鏆傚瓨鍝釜鍦版柟鐨勫唴瀹癸紝涔嬪悗淇瀹屼簡(jiǎn)鍦ㄩ偅涓湴鏂規(guī)彁浜わ紝鐒跺悗瑕佸埌鍝釜鍒嗘敮涓婇潰鎭㈠宸ヤ綔鍖猴紝閮芥槸闇瑕佹敞鎰忕殑錛屽惁鍒欙紝寰堝鏄撻犳垚鎻愪氦鍥炬販涔便傚彧鏈夊紕娓呮浜?jiǎn)宸ヤ綔娴伣E嬶紝鎵嶄笉瀹規(guī)槗鍑洪敊錛屾墠鑳戒繚璇佸緢楂樼殑宸ヤ綔鏁堢巼銆?br />鏈鍚庝竴鍙ワ細(xì)Git鏄鍣紝灝辮鐪嬩綘濡備綍椹鵑┉瀹冧簡(jiǎn)銆?img src ="http://www.shnenglu.com/deercoder/aggbug/160007.html" width = "1" height = "1" />
]]>