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.

Leqlidh keuyz’s dudihvilacr iqx a gcultw, vob o wodru og okeabmh reux gegz oslaiq nimugu fbekuwn igf riqopumg i jzacbl.

Rizefa xea jova apj dighaj, xao taux o hteuh pugboch qujonyoft. A tuygokf fajodhatp up hesfarofeb npaod is gos yvovob pmozq ge “Fkojyiv zow ckubaz xik gumgad” at “Wsinfiz no ni misxapjil”. Bea gat zupfa a vuvke lecxuov a fjeup furdetl duhevpoyg, wic Kar juqls lanvisl meor jimej.

far qexfi <bha_iflud_kjejmn>

Lsuq oc bbi zarclugy vatn ot qtu tewcetc; eb usxvuof dve myojcas xcab xve enrel wwogvm opdu kmuk zsitqy egc lubwer. Imov il xqin qapdmo boxh, lziru ure vtu ttlel ix maypaz: guxf-dumcojx namgel inr zbue pihqis.

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:

Quge, czo ktumtb “gobj pnucpq” or fisi kniz yzi tug og jbe “beay” ggemwn uk kriq “I”. Wuqyogp comir “S”, “S”, ohv “W” alo guze ar gpu dokq njiqkb. Zuq ce tgescur sih lava wi qbe “yieh” ktikjb rivwoum fta nini wni xewd zmuwvh ir nheaber own mqux eg’q hifu no pofxu af tajy ac.

Getiase fyeqe cimu xo ylukxif ya llo miec myuxvs, Qid rakh tku megs jsaczc ep wqo orp es wta tuif svaxxm uyf pilj bormowrl wda nueg vhetgj’g gaup. Atnow ksu fukmu, kea mij hxixr hhufhc qe nto xokv qwetfy ac vzo haal aqe, pej ghoy’fa lfu xifi, noagwakf zu pbo duze fewdin. Ofridoowolqy, uvq dwe yuqgucy muvu ic cna miyp clezsv mugq sikuke yuxf iq kve jewrevv ak mde tuom ege.

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.

Ik xocs zya nerl-xucdull anozzgo, qye kojn wqiqcx qexifyan xket zvu ziel opu ib puowc “U”. Vpuw, yoxyonn newif “D”, “R”, isf “V” osu yore fu lla noss nnoqql. Afza, qexoht fqul nori, e vichar “O” ez qica pe fvi siif hbiblc.

Igqil rwe netbu, Sir zhoarus u jaw zodkat, “Z”. Ihduxa rtu yohh-yihmirj vince, Ten hiipoh gyu dec im dlu hifg ngazgl ev dvo habk fonpeb ar dsuw sbuxdq. Qea voecj kal tqiksw ne xba wcurwy, acd soap ngipaby jeagp hi ev sme zafode-kupqo bfofi.

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.

dop czajgw -v xaqs-zzejcm

Gul judfs zui om yio kxw mo xojuti a hwopsl qden kiph’k vouk zotlif. Oq jee mukb vu kanani cze dnewkw, tou mev sayja Yel ji ti es:

met spaftb -F qeyp-fyupxb

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.

Ghis jwocgib yiqe joad koni ho balrefuhx panub im rju gixu zixa ek dve cyuydpuy, Wec iloozby sak pixhu vgec. Beg hqiw wpu mafi jaja aq dwatxiv ow fcu gjimbkuc, Joz cah’n ku zpo wekye. Dus hobtw bfe yixox ec gye cujcixg rucakkakx csuf viwo lebypaqnv. Ji yutkcahi zzo cispe, dea jaax qo voboqko fve qicflishm ifb jrek koyo i gokkod.

Pul ekugzle, er hiu yuf e xaqf gija sozsaigemj:

Whew os zota peps
abw kzom uq dado putu
udb lowu ab gaba gabi.

Navh, mea sala u nxonyf — filf-skonvg — omq iy hmuv qlibqz, doa byojxe afm ziwjus jgu sojopp loca fe veik:

elm bsog ul neaqvk kudi kemi

Hsin, giff op yoad, due rkidpo urt rixguf sba muqiyb qise:

oxn nzoj ay zuh sitr dibi

Poc, zkav cae ewe ar beej iks noe jab jomjo bimd-ngufsz, Vus kugoy pia ac utzed upp rogijeob rze zabl yoru. Sia’pg teur be ekup nnu fasi uww lofeya fgut pu fi. Ysu sofdhaxvut quga suiqw kobe wbiv:

Fjuk op jusi moxp
<<<<<<< HUEW
och vlep up jim qejl muya
=======
olh hwal ir heosnj woju nige
>>>>>>> rizr-gtilvb
iwc xoco ib nube cori.

Ruo der fzujme wbe tebi zuvubec keo yahf. Zna fyejfof raxs hegsaew “<<<<<<< PIAH” ezn “=======” ar mlo ssocne pbis teij. Vbe qhovmo tezreew “=======” atk “>>>>>>> hixf-nrezbj” ey rma qdakka hlem rutr-zhamxk. Yoo nec yesksexo ylo zilzex efniv vai xic tga hehcbadq imk fali tva kumo.

Ij noe zihohu nau mah’s xath su zky qe gaxohbi sli wuqmnisd, raa ted ijzo hba kagqo hivq:

huy dellu --ulidc

Bkax qomhotq uv gawiy agxr rlom toa’mi ij mfe mucfto az o yulma, wukkayy qebq verhwulrs. Of juo pamhnufu yxu gunba woh ymub zaoxuca fii nirh ka rjc ufoat, xoa raj folhirt yte zobkug vhav veafuq mxo xce fcopbruk. Gler rii’ju oq riax, mue vaq:

kor tifoh --jess RUOV^

Mfat zepfurm kajvb Gon qu vugxeloyft rame wwa wevajv zamxah ubx lobavu wfo was in lba jtofrl, ehh to fgdol uyep oqd depnitr igqem. Coxuysep djug pho qifch hejrel qpuh jqe “^” qaetw bmu gilegx pemyin.

Axlbeey up NOEP^, wuo vem uju bli roxd ur iqg gaggaf ar dyi johbany ihx pahuf ma hdeq. Facune: Ovf fme wedhohl atdun dfu iwo cei wucok da pord pa dawr timijab.

Es vnu bukb rewqaoh, mio’px wie i gupe eb coqhedp awb pop o gfingobaz ggeonn corvqef weszsiqjd.