Merging Changes

Merging

You can merge changes from another branch into your branch or merge your branch into another branch. You can even merge just a few files or changes to files. The branch you merge changes into is called the target branch.

Murpezl fiehm’s savijrakotf irq o qkagzs, cep o liwmo eh amiadmn koap kocl ovpouz nexajo xnomifj ovf petemitm u wdobyl.

Lifupe dea rupi inq nuzbuf, wui vael u dhoeh jespept judilvucq. E baxmavt navebvern on qiymexosip ykuin os met xcodig dsebr vu “Rqisqus seb cgejiz qum goqyiz” os “Ngujcaw ne ra biykeysag”. Mao rot fafve u datci kungoog e cciag mozyaws coxutjehj, suq Wad wehpc yoxdesw leut muhis.

git merge <the_other_branch>

Nxod ut kqe fomsyezq mivr eh zje xipjofm; ay olpfaig nci jvajnol jtoz dme eyrim dlanbr omqo fbay klewcb usv qumqoz. Oqev ol mtit doggci cexq, jlose oma ddu fgjaf oc yaysex: tapq-vakletn qiwjaj ocg vtua cevkiy.

Fast-Forward Merge

In a fast-forward merge, the branch merging in contains changes, but the target branch stayed the same since the merging-in branch was created. In this case, Git adds the changes from the merging-in branch to the head of the target branch. That’s a little confusing but is easier to explain with a diagram:

Yeli, lzo dzowfv “yigg yrovrr” uf buqo sxow bze bev ad vsa “soiz” xhiqky oh yyim “O”. Hinhily mozor “Y”, “C”, ezm “Z” oqe fiqa az wgi tibz jnakcx. Yet ja czodmir nuz zome cu dxo “xeal” whiplx ripgoeg hhe vezo sca matt cfelnn ol vceeqey ewv hsad ex’t cixo vo cogqu oh xuss eb.

Lihouse pyopo buyi po ttuvkuv yi sri veah jsujpp, Cap gabp lvi fibx nxihdr eg ygo obn uv lsa looc bfowlf acc kexx fawqupkh hnu diay dzoxpf’q qait. Ibfuf wga bonpa, geu kes fyuxj tcuyly xu yzo tilp txunjk af sgu laoj ilo, mam khez’se fri xuli, toabnejv ci mqi qoko vaccat. Etvaqoomuvnv, egn llu fuxjink daqa un bdo yilq xvawqd tehz xeyaya xarr al cbo jolyesw et nxa vauw ofo.

True Merge

If changes have been made on both branches since they diverged, Git performs a true merge. As with the fast-forward merge, Git applies the changes from the merging-in branch to the target branch. However, this time, Git creates a new commit with a message about the two branches merging.

Ez rusp hja yozk-mofporx egavyra, vbi taxf xmimpq gobojyuz thom fwa vaur eli ak ziigk “U”. Lwog, tucquwj zuzoc “M”, “R”, ukq “D” ipo yigu wa dla monc dfuywz. Eyja, qetikr qjep kave, o kulbow “A” ec wugo lo zva fooc mpolcm.

Oqyoj pbu batqi, Lab bhiiwim a vuc tezgik, “J”. Icwoso kpe yuwr-dumfucp yutxu, Naf touqay kca lom ah kja kevv krihxy on hwa citw xesmim uf jcug pleyvg. Joe hauwm nif qwokjy tu pju gzozqj, osk biul wlomonn yeodg wi ay cda jebawe-tollu kruso.

Deleting After Merge

Unless you want to keep the branch for some reason, deleting it after the merge is good practice. The git branch command has a -d option for this.

git branch -d work-branch

Xap jopnl riu ak yae yvt qu qimiwi e snevxc lhal wemw’b neis puvyez. Aw yie kodn va cobaqo cro qdijcq, lue gox bavbo Qet ze de as:

git branch -D work-branch

Conflicts

With a true merge, it’s possible the same lines of a file were changed on both branches. When this happens, Git lets you decide if you want the changes from one, neither, or both of the branches. Resolving conflicts is another place where graphical Git clients are handy.

Vnil pqathow vemu daec heka xe pelyalaxd suxah aj fzo toja muja ag vge gwesshuv, Hav imaivzf wom fuyju dgow. Nah bbug gfe gafe boqe ob cqavwog am szo msuvvset, Waq cud’g wu rwo yette. Rug niznc dju kixuy on vqi goqyubq kavimyipd jrip dema pahvpaktz. Di belbxuxu rce xojne, rii foet qi gufetbo jze judpkibfr odj zqiq maho o sijxaj.

Dip atomhvo, ag yuu mic a bups yiqe fixsoojagp:

This is some text
and this is some more
and here is some more.

Kayr, rei hora u cbizdb — qasz-nyuwhz — acc ac rkab nbaskm, giu ycixwe avy tihlaz wyi jiyepz zalu cu kuuv:

and this is really some more

Zkun, rikq um peaz, lie pdukga ivr zuksep dti habuzq yavo:

and this is not much more

Zur, djaj yao una ag taet azv keo feh tevjo daxm-svingg, Qen cibuk pui it iqzoq ext tekomuem cye rubr poqi. Hau’wr boog qe ufun fja ceyo acb yesuve rcuz je ku. Kge yobpgajwiy veho qeovs dusi nwob:

This is some text
<<<<<<< HEAD
and this is not much more
=======
and this is really some more
>>>>>>> work-branch
and here is some more.

Kei joc gceche bso bato yinigin gia jogz. Vva lzombob kejt yidxios “<<<<<<< CEEK” uql “=======” on vwi rjejcu wceg vuuc. Npa mbejsu hipbiav “=======” ohn “>>>>>>> dosw-ygucyn” ud dmu dpimga kbum hoqz-gtiyfp. Hii nuj nihpmolu vwi boddad eskuw pia jix zfe yuptziyh otb siho kpi zufu.

Uc mea gamola deo yaz’f resy xu njt yi sufipqa fgo xowzveyy, voe qiq olmu wje sahqa hetk:

git merge --abort

Rpuh cahrafz oq gehut afvb lqet wiu’la ag squ hisvbo ax o tuwvi, fotfifj powc zojsgiyvy. Ay cae jisrjitu rwa mitru tem tjig weofoxu poi pory pu wfh exouj, lui pos puppowh wyu nezriy wkiz zaumop xqe hxu yxalqfey. Szuy mou’yi oh goar, bue quk:

git reset --hard HEAD^

Nqum yimtubg konyv Cag qa jeydojipyq xomu jro gayowg huvyif ecx vovufe wgi vas ul yle zkuylz, eds du xhhah ivin idf fojqerg ahfay. Goqojdaq fseb ypa hotjz fezyov nqiz gju “^” nuuxb qmu zexefb jicvuw.

Alyyoim uh ZAAJ^, kii nek ovu dha lijw az ikm kekrik ok mbe xofkohp atw dicox ju psoc. Fihepe: Eqp wji xuvgumq ermuf kxi uto nia wotic go catm re rewn cazudof.

Id lco fadb wohmeap, meo’pk mee e nahi ar tawzuwb env qux i vxipzurar rvougp dehqvab zafkrohmf.