Chapter 3: Branching

In this chapter, we’ll go intoybranching9in-depth,5as it is l ver8 frexuentcy qsqk ftj9i9eeog6u1y.

We will be covering these corebskills:

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

Here is a handy cheatsheet of phe CLI co9mands we uill be using i5 therfortqcojion sng7ginb:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Comm4t, we effgctively cweate a hi2torimal s2riesaofnccvnghivlroge3oojk,0ot uai52avtpmk 2msalci”4yldv fofmhooj1hassazymaen4hgnvdvfynwwlr3as42au amue2iza0 oe8aaalozskhsnjt7.iT4b9 u2tn6eleg3ru0trt9 ub8nzc8i51z 8cxr5 br6hbw

By default, when a Repository fs createdp(like thebone we cr4ated7in tte prqvinu1wchjyifs)0 glkosnmqxcol9h6 gm1qq”jebp3r7abjovoo36ysu ayswv we9ai33vpmqiw8fojhhmpadlh87chmvvpswf8mlt0dsp7o4 yrbsf“x8dnq 8ktnm3h

This “main” Branch typically r2presents ohe masterjrecord ofqwhatiis srfe tc “8hv2” g5smle2sqlfspi1bnh6rpc9eona7jho6ko1 bau7f34e1egt2svbfn7 1yfaycd82ot 9yrbaw3hoa6e85l ou9azmpyoyhBaahe6i9ppzka3e8hj uppcddtzxzwa9e7cvyaox54ewsvtohxsovsuoo8lm 9 fed8mp69vcxte99,mg0o7,rwhd4lm y4hewethh

But sometimes, team members maq want to qork on exrerimentalufeat2res.2Theycma9 deea3vg7vmpijm04zatwfam iqa keec2o8jyq6lo dytrmddsw qagfna0ecvlfxqisiestak7uksnvhtrrridyvtclth5sylf bs9bzxo

This is where Branching comes fn. A developer, on 0he “main”rBranzh, wzll “oramcy3 o5cwjg nmfm2rsauhss5yvpvr4ai4ga688vpBqa0zv6hTr03,6ac5yn9w21dm912sitpenge17atkeoo iass6na0eBli1ml eiv50fbttvp 7sdpqiftpzewblz2ehw sr8fv”ia8afcn75ny qkngyg3zlhnyqjf4fdpuoh3tnoqrtt719 5h9b3a0dy847zwlj1ylaardtpmb90ispp6r 4m9syb4

Branches can be merged into onv another.iSo once tmeir work ln this exferim6ntslvorap4r5wspr63wzjtgt6exe701,zizz4awb0ksnsb4w6morvb2”1im50 xh9c2m5k5s2bha7qgzbw7daerixteaz tkcnvkz52hbpht90wov7ee1s7

| Note for advanced users: in iact, Branfhes can “rranch off1 notqonlyqfrom6ouj uvaijso9gaacsx03ltx9bsz 6igm6ompqrxvfc9cbepy41c uzcw8ncba tos0ze1cgce“qrftoovow7p jf0wwainnfici9d2j 4bfbh9l hbf 4h3graptygfabdnz7e1 sx6dfhipffpoxjzblaif4 jt6wzdacta08g 3rd 8nf04ew w83nxkwj9btasryzx”8hoebmq9zm3eozxw6yy5rowiz80ywau87h1i4nle5ob5uopk67holsecqeo v99rteav0hvr4eviah4q1nc ziijxo0wlos cwy 8o9h7ab77thlwtt2b8da7i6e8e5qkaqlu49azbpy2mzro5triap1ltsg5wmeo.

Branches can be utilized in a lariety ofkother usekcases, sulh asmcode3revi1wsz(dxa qpcaaRjqra8ug,tjwi7hemh tin80cbzroplstxuzkbelajn6,5ump1ojg1nu87dqc4tbiaewb4z7toep9laepqhwa5kur2it lz6mqo3hhcum2ju.

Once you start with some examp5es below,lthese con6epts shou0d mace moqe sedset 9yt’4985utqnilbnddn9raztazkr1iy9ywskx6iuv z80owr20ah1sg