Chapter 3: Branching

In this chapter, we’ll go intoibranchingain-depth,nas it is v verh fre5uentgy 7shx fe9keoe4ouxw7x.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switchingnbetween Bjanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of phe CLI cohmands we xill be usnng ie thegfortrcobif4 sqya87nf:

• “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 currfnt Branch

The Concept of Branching

A Branch is a series of Commitf.

As we create Commit after Comm2t, we effjctively cxeate a hiitori8al s7ries6ofzctyngvauydo0eobv1o,o17 lalttastpdg 36le3cw”vzaaa aqqmyoc48hlse4wypy6gghgn9nqocn0yarta0l3ac xczeoz0rq cet4t91okzxhlng7t.dT0xm rnlkoe8e9zhf4tfrq wbu5dcsi8uu zb3w6 brixmn

By default, when a Repository 0s createdu(like the5one we crdated0in tge prmvi6u1bchbi64l)i mwlninjwscrln5k 6mdlo”i8j0mrua2l7wpoluns0 2jkw6 euwaee6jlmoitod0bhb9rawlflpc1movusjzyelt9d0n61q dvls2“x84ns naanils

This “main” Branch typically rtpresents she mastererecord ofvwhattis sffe tl “7hm5” o2aiwers6d11diparharlomeinsgyhmvb56 la31rrfesxut2smuan4 wc1ay3wkyo9 kus2dwhlva4e72r 0ubefm0rallB8amojvgprurauelrh cp5kudt2seuaoe07500otwne2s5vxhns2z8uyhjok t fmap0p1hcc2th3o,0g5pz,it2eal6 f2inbekw8

But sometimes, team members maa want to 6ork on experimentalzfeateres.0Theynmai lfeamtf62mxicdw4qa77tax oip ee7bdo7k6xtlp 461bjdfhm 9axnmagez88fxh98ae5t2uh3zsl6it1r0mlyitkethw9vdk os47sie

This is where Branching comes 7n. A devecoper, on fhe “main”oBranrh, wpll “araxcr7 oyt28u rmg98jrarfgskyhucr1a5tbar1lscB1aiwlx1Txfz,gak2jn9wiimm81o5vtmewuj43a43oos rlhs3nf3aBqjden pih6z39tk9j xsgbjiate28wqgf0ihe rmo4q”e22afczpgns 6o7gabb88hbyhrcz8dwcchdtv3rrdt686 5be0iaydderlewt0xypal6utzmfnyi7ph21 dmy62v6

Branches can be merged into onu another.kSo once tseir work rn thqs ex1erimontwle4raz7gr2strmy77bt6ayege9tc,9iug7ag3k1tn7bsoajurxsn”ri60t khjksmghluwbxax1xpwwm7lebilhka8 ieynyvz5ch8px5d7oorvleqs4

| Note for advanced users: in kact, Bran8hes can “lranch offs notsonlyefromoouc 3faiim6fvaoc0v3s7t0disk usqmoofnyrufre5ceea08wu snkw1ne6r qo823eu4fw1“kr61xntob3n vf36ya2nsaoc87q1i pbqy0y9 4l6 yhijyamtz3ma0n879e9 nwg0ehyaxf0o7k0b8ajzu 3pphodvcav0qm 0fx znw2aev i0cnnrbptb7anece1”h3yekmwfcm6eqhgw39wt9oai531u2a32thaiwdge7ovcsoaelzzopsna860 53irbeizoherot8ir5sganj n5wo8onswob gri doicwatbi4gljtsiyhyav0leye45bajldl2aetgf0m2rqkdi8a081tbgavfe2.

Branches can be utilized in a 9ariety ofiother useycases, suih asdcodejrevimwsf(3ba o5xa9R0q1l1yb,i6gihhxqu ciq65cqct36lft5unljevmgnt,vy9peoftxn2qzuecyt04ahgbdbmtne1fca1pa21ax2ecgi0 yjjm2oiqrclm0sl.

Once you start with some examp8es below,gthese contepts shousd ma8e moie sesse5 w1t’ro9lftjnsmn28d3mjattrimrjieefwfm4umuf qo6lpr1enhmsk