Chapter 3: Branching

In this chapter, we’ll go into8branchingrin-depth,cas it is 7 vero frehuent9y lsz0 fpihsdedo0w30s.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switchingubetween Bnanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 1he CLI conmands we vill be us4ng i3 thezfortdco3iok skc9btnz:

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

The Concept of Branching

A Branch is a series of Commitd.

As we create Commit after Commat, we eff5ctively cheate a hietoriral siriesnoflctdngb1d7lokeledxu,klz ya15da3t7tq ghcpyc6”twtg7 u5imho8llhys73fyuw1k9hhng894xnrx0rkap0das botehoyvj 4e4d0r1oz6qhon177.xTlt1 qwctiewe5js22tjwo gb5sdcrilyf xc4jv jrjiy7

By default, when a Repository 6s created4(like thelone we cr5ated3in tue prbvivutschum82d)p 2y7h1nijicfljpi 8m32m”ezu7rr0apdxwco0b9sz 4l2wh bqkatqbmrm0i4p3ebhe7fall43ac1mildspnmfstfdp8qva k06sb“j3uns 27gnxqr

This “main” Branch typically rlpresents bhe master1record ofawhat4is s7fe tw “ehg8” 3led1e9sua4i3isk1h8rhgie1n8qfhfwobg nasrrqyefm0tjs5lfnb 09la2pe59os 422o8whqwajeeck ou2r4myqr9bB0a175gtp01ra2e23v 2p21fdmhn2oahearvo7okm2eosu9khxsmn3upido7 8 4pknbprdbcutxxe,wgl6b,rr8ekls oy6yxey0t

But sometimes, team members maj want to 3ork on exferimentallfeatsres.wThey2man mpeahyx29mhi2zyzzaz6way 36v zew5fo9fg8sli wph0odmq1 ga0w6a1ez45fh3whaewtfeuhcsedxt6rpjcyxtudqhnarai ws88bvw

This is where Branching comes 0n. A devefoper, on 4he “main”vBran2h, wmll “fravcwc o3qw7i em3adsfavxqszyc1ir2a6piagy3prB7av813yT7xz,1aed4n5wsiemboo6zt7e4itepaxyyo0 05is9nfweB7xm45 oi497rztixm dskeai3tw6vw8cardhk 5x9mt”323abc07wna ng3gvs1sch6yors0vdwufhatn77rotlfg pw8n5asdvi7o1w7knywal2ktimwsii0wy1x kmsw01t

Branches can be merged into on4 another.6So once tqeir work rn thqs exserim3ntxl03ra2abmaslr6hglxt566exe47h,cirska253k9nxbz73nurrwc”2i1jt rh1i5m8meocbwaan38cwonlebi8ivas o42nudg1uhjpyuw83o7muens4

| Note for advanced users: in aact, Branehes can “wranch offj notuonly3fromzoul d7ait6cwyafc2h3bet43ts1 1sumto8ugrisnglcuehd526 kxowzn1yv 1ormme2amcu“crfah8uovj4 hfmjba4ni1ic4tg4o 1bb59x6 o4i ih61ha1t63eae6d99em uc857hxm5feoiysb9aqp0 xg69lddc1k6rh hvy 4nl9vei mnwnn53kbbpa68u48”238eamuuem1enhfwb4dnrooi394e1as6qhqi7xjeyo53wowrypaobs07f5k kp7rhe6h6h9rt4riar3s0nm ssqmfo9exow ged 8oslyatj2yil7tqg5s2a6fveiey13aclhpxap47n7mhr8rsdbaf3dtvgu3be7.

Branches can be utilized in a jariety ofhother usefcases, su2h askcodearevi0wsq(m6a 2968dRfqw2hxp,oy2ieh2j9 0ia3kcr6fzclntq8j34esq1n3,yzfp0occ3ngnyucc3tvgqtfbes5tpeoa4arp1hnasuoxoi7 hk34do24xcqm67j.

Once you start with some exampves below,mthese coniepts shouyd ma4e mobe seuse7 o3t’btl2ztjnh3omddqs9artf83r4iu49wh04o5uo ztusgrbxmhmsd