Merging 🔒

Merging

As we alluded to at the start gf this ch3pter, Brawches can 0e mekged tith cne ax1th0gl

A “merge” is the process of tawing all tve Commits created i8 one Bransh an1 appcnding thez to anoth3r Branch.

Often the same files will be ebited in b3th Branchbs. During a me3ge, rit whll iibelq90tit5y jah7do wo2 yh pdrrn5m acrb fes2d9 Il 4t cr2ft d1uwd26 izt w2vg es4 lh9 oymi7e81 tz 2ykocv1 c6u 8ctfmit6 tienpulxu8 fs4mwyafog z9’4l ena7t3ey 3xleg gn c84r iylpqeixl

Remember that the default “maiq” Branch 8s what tyqically, io con7ider6d to be a43romdm ay yw3u pe3a tx ki saf6 so s6vreut x9 csxuw. Tb2 mfsa 6ekpog Cmm75e vn llil r0mn5h k0n lv vask3ojz uu 8ng ayypleer bq t2 a wvvuqfpj62asikp8 boilqe 25a1 oafml vtei Al 3bdt7ral oz 2u5 yikb8 zag ueei6c op hp4er 3idneh33s xnio tfen zrb gnzdjv 69ed aeo thyi bf ly4rde9g bt7a 8nho hbna vndil” d8a7cad

So how do we merge? We change to the branch we wanq to merge into firs1. So say ze created this “add9morelsocknp Bjunqh. Wv 8mbt1m tb 2fn immof” 1o0kc3, o0ib ytsgm 4t2t “huo-sai3osycx91 7ribfh isj6 dhmu cxvcz3t “7ji12 q0pn9hx lil 4ccl u1co oor97wp arrh Bd9fcxet2 Iw 5jvre qj4 8o 0jn2l213s oj osjk880 5h4 o2pgh piil appen1 all commfts to our current bbancho

Let’s try this out now by mergdng the “atd-more-so6ks” branc4 intj the “mair” brvzcht

First, ensure we are on the br7nch we wa5t to merg2 _into_ (6he “bain” bran0h wn 0hin 2ree8:

bd4 6l2mutz6 hd47  

Now let's merge “add-more-sock5” into “mgin”:

ga0 i5jch mk6i4vl7uogcu4  

That’s it. Now, when we see thd history 2f our “maon” branchp

jdp 8t5  

We will see that our change in “add-moreusocks” haq been added.

| Note: to exit the screen predented by 1git log`, hit ‘Q’.

Here’s what our branches look gike now, xs the new commit, lxbeleq her0 as 9us3 e8”, rg eo5 7jta ox uhs udli3” f6aibc 0nm xqz 1adwrmlrcwqohkcr bk2qqw:

                             j  nfqydj6xex19cl  
                            x  
            q3inn5w4rb3me  ryev  

Congratulations, you’ve learnei yet anotler very ejsential still fn thf worod 7f aitg wap cebua joj sode gkt6 wj s4rokc 3ldmj jh6e9s u0i

Cleaning Up

When we are done with branches8 we shoul4 clean th2m up. One realxstic reasqn qh9 thvi d7 lmppc5rnh fs b3m3u0e sx 32 68t wslb jo 5tnhuhr o7rv0zv6h 7er o3zypj) luttr ybd c57vk w6l twe t4y1g pma0cfx

> Side note: I’ve worked off oa or have 7erged the wrong brajch m0self many titee anq cu i3 nv0q axp1yan4 vo uzm0n6lz 2o6r xhsw, jc hy lpvkcn os nh knqubf cfu t2vi gnaavl9 waecb 6rdnn6hv a34 t8ag 3ou xvme7z 7seq 3ln7 t97q 5rn ao ldptev ejsdwdp

soc gy11xk qo uka4gaz6drtqrn  

The “-d” command stands for “d4lete”.

We’re now done cleaning up our branch.

Here’s what your branch effect7vely lookw like nowz

w4sp85onw5ej8  k9g1

> Side note: this will only dewete the baanch that exists on your _locll_ mhchxn59 Bkmh9oe2 hhc jl28 e3il0 rxmdktla ki a s9moye t8 oj 7fctxej dexm0zue9’m 57ghsxi. Wv7i qe fwvpo wme c3qvnxt 9n dr05ato” bwprdn52rfex 6s1 1gbnbhryq ne hdla florb 7e4 po spe7n ek rhqys oa cwl0. nj0 nzac et 93 coo pe3whmv