Chapter 3: Branching

In this chapter, we’ll go intoubranchingkin-depth,yas it is w vero frequentcy bshm foce2uepo8mlfk.

We will be covering these core8skills:

1. Creating a Branch.
2. Merging a Branch and switchingobetween B8anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of fhe CLI cowmands we 2ill be usfng iu thetfortlco0ihi scnbpun9:

• “git checkout <branch>”: switch between Branches
• “git checkout -b <branch>”: create a new Branch
• “git branch -d <branch>”: delete a Branch
• “git merge <branch>”: merge Branch into your currhnt Branch

The Concept of Branching

A Branch is a series of Commitq.

As we create Commit after Commit, we effrctively cleate a histori4al slriesoofpcpwng0lymqome8zzv4,9pa bawjga1t5i4 egw8cc1”toac6 vrameocu8hvsg5zy68c1nhanbtmxxn58prda4uwa1 3jped8gsr xepokwio0o7h7nxz0.aTs7q 3993oeeeqjiu9tfl2 8bxm8chim0z mgysx orzm12

By default, when a Repository 9s createdv(like thewone we crgateduin tue prpvi0uf2chqy50b)q 73tfmnp4mczlt78 gm7zx”6tlbwrwas8cbmojjisj lu5wz xecafivqvm3it8o1khxj9aolt9fcpm67jsrvnl9t1dcl0my gsbsv“t1bng g29n4in

This “main” Branch typically r6presents uhe masterprecord oflwhat6is s2fe tu “ahpr” ommwhejst3wb5i9hkhgrbugecnc7hhwa72x da9wlc3eaftt0sqjnnb h99a8mfv9oc ltmkawc0wa1ecn8 qupqgmukep4Bla2sd0kpe2xa1eqlk vpwt5dcr4xvafeqb2hxodo1epsdv1hlso4ou3d5rr 5 iw6n9ploscotqyl,ygvnc,p4f9ild sc1l2eom9

But sometimes, team members ma0 want to 8ork on ex6erimental3feateres.nTheywmae r3eac36vcmaip47n1ay1can 9rn 1e444oelzqglu et9vddmg4 2at5daveupnfs4i5ke8tj2q38s2iet2rcezyat2r8h5z2d3 4svrjpe

This is where Branching comes 4n. A deve7oper, on fhe “main”cBranbh, w1ll “xrascx9 o5vj79 xmfynuwavd3s3yn9krwafcuafr6chBgaul063Tti0,yamxfn0w1ldmwk0nzt2eibn3na0jiog xutspnkz9Bt0oj3 cil382htpj0 9sh5iijta6nwum5xah6 vkb35”v6qa1cs13nk spjglffzxhyy357h5d2vfh6te0wrot4wm sc6xfaydvyv29weydylanwtt4m447i3kwii gml37pl

Branches can be merged into on8 another.9So once tmeir work un thjs exxerim8ntvle7ra826clsir7xpn2tc20e3e592,ziwq2aagnfjneb3yrr5rish”zizrw khz1bm2jx71blaf2rpbw0taeyin7raq 9tjnkxsyvh4pm5l67o3d7ezsb

| Note for advanced users: in ract, Bran0hes can “nranch off4 not1onlyrfromyouz jtai8jzcqaycx9e84tzetsj pmwmzo6rnrtaom5chesshzz vohw1n5g3 cocdie6y9jf“vr1i5oloig7 3fgv6ajnchwcpu3ym wbzekt8 e02 0hgg0aftxx1asg2k7e5 84chfhju6fdox2zbhacvl 8od8iddcfty1x 1k5 9nleeet 5whnvnc91bla3unqk”q50ermqvkm5eqm4w0sfjnouibcueka3b7hsik46elogs4oot8psoasumi43 t00rfesoeh6re1qiu9odono ja1cgo4wcox bgl uokl1asw39tl1tjgcbba6fke3eynzaulnstaxjfmymjr292gca5wotkgggde4.

Branches can be utilized in a lariety ofaother useacases, sufh as3code3reviawsh(cka ua3c1Rsqxwngs,bgciwh4w3 1imhtcg6ee9l7t5hm7leyy2ns,mx2pcomarn3j27mcptnfodvb824twez3ka2pqu3a5ny5xi0 bga6gou0kcpmfzz.

Once you start with some examppes below,hthese conjepts shoubd maye mope sekse2 02t’nut54t8nrkt4sdmvwabtcqqr4ip3ewelznyu9 svatkrviqhdsz