Git Merge He Rebase De Qu Bie: Zhou Mo Chu Men Da Che Hai Shi Zuo Di Tie

Git Merge He Rebase De Qu Bie: Zhou Mo Chu Men Da Che Hai Shi Zuo Di Tie

Mei yi ge Git xin shou dou hui zai mou yi tian shen ye pai zhuo nu hou: merge he rebase dao di ta niang de you shen me qu bie?!

Bie huang. Jin tian zan men yong zhou mo chu qu wan lai lei bi, ni yi ting jiu dong.

Merge = Da che. Ni he peng you yue hao zhou mo qu you le yuan. Ni jia zai dong bian, ta jia zai xi bian, you le yuan zai zhong jian. Merge de zuo fa: ni men ge zi chu fa, dao le you le yuan men kou peng tou. Ran hou dui da jia shuo: wo men liang shi cong bu tong de lu guo lai de, dan wo men xian zai zai yi qi le.

Rebase = Zuo di tie. Tong yang qu you le yuan. Dan zhe ci ni jue ding: xian zuo di tie dao peng you jia na zhan, ran hou zai gen ta yi qi qu you le yuan. Zhe yang kan qi lai, ni men jiu xiang shi quan cheng yi qi chu fa de --- mei you ren zhi dao ni men qi shi shi cong bu tong di fang lai de.

Shen me shi hou yong merge? Gong gong fen zhi (main, develop) yong merge. Bu yao zai ni tong shi yi jing la xia lai de fen zhi shang rebase, fou ze ta men hui hen ni.

Shen me shi hou yong rebase? Ge ren fen zhi (feature/xxx) yong rebase. Ni zi ji de fen zhi xiang zen me rebase jiu zen me rebase, ba li shi zheng li gan jing le zai he bing dao main.

Yi ju hua zong jie: Merge bao liu zen me lai de, Rebase jia zhuang ben lai jiu yi qi.