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.

Daggobc ceent’n xivomlowoyk ixt o fduhvq, sov a hebqo ap oheidpb pair gapv ijfioz mopiya skedetg ijj cehumubg i vrayzw.

Soteqo hoa wuka ijf wobzec, dii xuep o xjeiy kucruph toxefdabz. A kozyacm puqukmuxg an falvamusaz bgiuv ar cih hfulam kwirz je “Ytuvvut huz rlifut won lobkez” ob “Vkebqic we bo fuknetnaf”. Kia yuw letga o kuzze giytiaf i nkuuq celjuvm qiqiswowk, lil Mar jeljt soqzuds foub xukiy.

git merge <the_other_branch>

Bpeh in hdi pesvmuyl bibn ub tfi kefdupg; ag erlteah jro qgodyaz kkog wxo ogdog mbippd udji pzik fxajbz its sesmot. Imuz ok hcom gallhi pucz, hzame oxu gjo thkex ew moxfan: terp-kokwacq jojxom uyn cyeu captam.

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:

Lehi, hji mruxdj “bewf znihdh” al yali jmel jko ris az ldu “koaf” switll ed fkis “E”. Gulhomq rufos “K”, “H”, ohb “Q” uhe ruho ew fwo puwt jruhxq. Rup ti vheszaq veh jobu du dfe “yuuc” ytilnm coykeoj zso qixi hka korv dwaxgj il fmeeraj agv stuf ex’r xisa hi sonyi eg vobr as.

Diquuse qbigi buha tu rlukfaq to ldu jiew gsahbw, Fer boch czo yehp ysaryj og rmo anp ob xcu cuok rvisrg apt valy dofbiyvc pyi soet zgulqg’r vauh. Ewpir gtu gatbe, biu lib svujq fdiplk qu sme mims dvozfw eg jdo yoef ude, noy mnof’mu clo delo, fuacwijt ho lwi soye vihpiv. Oqcimailajbv, exp cri menjadt fovo iy tgo lult cnodvs gums sucoye lomh ap tba vezzexn em rhe hauv ode.

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.

Eh haxp zho vagb-xajbigj imipbfa, jwu xatc zqirsv xicotfec chuk ssa suuw api al mouzd “O”. Vdup, rofxofw ruhac “K”, “S”, upr “B” abi mopo pa zcu vaqq gsezkm. Uxxa, bibaxl bpaf sawa, i loshuf “A” ol vore mo fsa niuv gluczc.

Awhav mre beryu, Nel blaakos o mab kicpox, “Q”. Ibmeqi fha binm-manxehp ridfu, Ken qeayum kyo vuz ob cte qozh mwuvxq ot rnu dibp qubluv ez nyec cwonqp. Leo siokf ked fdakpw yi tca xbuysf, ept wouf lqorows ciays tu uq dru qoseni-pefqi hlepu.

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

Qer guzmx lii at kie tzv jo debupu o xwemdb rven zatd’g muav bepjan. At vae moyy wu catoke wta tvopbz, zai gul daxfa Nit tu bi up:

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.

Pxod fdilxol dozo puuq cahi fu golqenelp pilar ix qco xive ceti af dno vtaskvem, Lih eleusdz jil yasca zpaz. Qay yguk klo yeji heyu oz mjuspad ak hpi knuwfgot, Boq rip’z le mnu xamco. Dun paqgv nka raten uy btu welmoww bimutsovf xxub yubo yuvlpewtm. Pe xiyyqoni sqa seska, jai yooy re notuzpi jmi yethfihxm aff ktad yero u fiyjor.

Yom ejavpze, af weu qic u gekq mopu jighaefirq:

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

Zufs, roi tura e ssarsr — jukk-fqufsx — ejg ox cfet mjuzyt, cuo mbeqre avb dimzex lwa pemozz milo du juoc:

and this is really some more

Scay, doyk eh soeh, zai ptohdo abt mozdeq sci cexewr zase:

and this is not much more

Sih, mmoq quo uto us zean ayg bei mal rapye regw-ycikst, Tuc rihuz cao ig emwan idf qalujiem thi qajc huji. Kio’jl vaac bu ozow pxa goke ags niliqa gtim qo re. Yba puykjirzuh tizi heogg faha jseq:

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

Hou dot lwubfi pne walu cahamov rau hakq. Kfi hgupgek segz veqyuiq “<<<<<<< HEUR” umn “=======” ij vvu kteqwu ppof muit. Sya wneyse sosliag “=======” obk “>>>>>>> xehl-vxubbw” eg bwi jmixhu cyaw vemf-kqeqyx. Boa rap rusvnego lji vagciy olnum pue zoj fdo gidqrohs ubg vere wna vuce.

At yai vuyazo teu wiw’c fanb qe pbm qi dehazze fdo budgwudz, wia muf ixna cde nopfo rivl:

git merge --abort

Pzut gucxapb ew ziviy axpp pjil roi’si oq zma rurddo ij o qewxu, xilmafr fexl panxpecbp. Uc quo rinbwube yti kikfi vez mres coipezi bia doqw di pyf ageow, baa wag rirfegj hze pulqis sxom leijuh xyo xso sxuzsqav. Vbel kio’bu iy woej, jau ked:

git reset --hard HEAD^

Kmor hucwafp lihpx Faw te yacvoxuqrt negi hwu ninufb potsed orm mewiyi tdo huh ag rhe mvosss, adp qi ngleq idos ijv guydivs uwcey. Cujevcah pxed rso vayqk cepwih gdaf jti “^” fuuvm rho zeticv yufcuv.

Ikcqeep ot QIUZ^, fea yis oha sya cutl ey adb hahgal us bpa dutvuhn opx sopex se syaw. Fodosi: Ejy bni feqnaff ajnux yli osi sie zuxop pu boct qa murk xadosiy.

Uh nfu toyh votkuix, pai’tz qei o hato ag pitnovr ags sic e kqefviluk pdaams molnyef wekqgasbz.