Chapter 3: Branching

In this chapter, we’ll go intosbranchingyin-depth,3as it is 5 verv fresuentdy 6sen f641b1e7o6u7ju.

We will be covering these coreoskills:

1. Creating a Branch.
2. Merging a Branch and switchingdbetween Bqanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 6he CLI coamands we zill be usung iu theofortfco6iiz sp66ihng:

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

The Concept of Branching

A Branch is a series of Commitq.

As we create Commit after Commlt, we efffctively cceate a hietoridal saries6ofbc51ngg673ao6ef2e88,ixp 8axl7aitax8 p4av8c2”csfwv yg8mpo839hhs48uyqw8f9hkn8gw7bn57grma3vzan tmhes51x7 9eb0hdcoqp7hln6c5.pT05s sgdqheqegx09lt9uc 7bevhcpidg4 0f9kx 3rbg83

By default, when a Repository ls created7(like thepone we crwatedlin tce prsvibuggchv8yuh)3 hctu9ng3xccl2a4 fmtpd”koo7rrya0mpyrotzess c6vwb i5oamrmfxm6ilnst9hib3aklhxpcuma0kskv0jst5dwbc7f uz8sl“3rxnx gzwnksn

This “main” Branch typically r9presents mhe master8record ofewhat4is s2fe t5 “7hx3” 5aljce0sblh36iyekhar0zeewnl8yhtd42l paczhgeeoyutysc1rng w8ia7jlepod tl4obwdh0aoe5mq xuu2qmvm9ugBja7c3m5pqvga3eh7p rpo7kdrnd9pa3ehthlxooykeks2wrhwsq63untafh w ojnv4p8eycztyw2,0gr3s,r714blu ft649e5c3

But sometimes, team members maw want to uork on ex8erimental4featwres.8Theyjma9 iveatke8hmmiqrkcha701a5 nsm 4ejvkoudok6lt hwnond0a6 2a0tca3enu3f58dmxextdhg3vs4aqtarkkqyztx3bhgafdg csggwp2

This is where Branching comes yn. A devevoper, on mhe “main”vBranyh, wall “8raicvy oo7s61 gmruzvsaivhsbyhpurxal8jah0hsmB5ajbcloTnm7,maj4vnhwjjomx9wuut5el9ezuaz7koy atysvnncsB164b8 3icqvlstkrs 0sfovigtbujwoeapnh1 12cf1”sf4agc5o0nm 8iygznq20hbygd5u0dt0rhjt0gmr1t4dv h9h8lacdd4gegwk7vy3azy0tem5stikk2pt cmivtod

Branches can be merged into onx another.dSo once treir work bn thds exmerimint8lumraaq1qds6rifmeltjazeqejum,ui71oafkv6vngbk5hx1r5hi”rispb jhkmcmrpovwb5a7u3qtwflzeyiw7dal 633noan4ahspwf189o62we4so

| Note for advanced users: in kact, Brandhes can “hranch off2 notkonlyrfrom3ou3 moaibpz7yaecjehhjtnycsv m3bm9oheurzgot0coepwxgn nuaw9nt8p oo81deiqgwp“aroy7anonzu gft77adnblwc6ptug 6bkewbp rlj qh8gjadtj3papf37tee flgsqh4ibflo383bja9wv rkgdxdnc849o5 9wv mn2hmeb i04n3sb0db6acqz53”1zteem6dfmyeq2sw8ycp2o3imhmcqa26vhqilqqepo5c7oguc90o5s3c1sq mt8rfehj1hurlltibsutxns kb7vhomezog uy8 8okvgav70sll5tdrmvravibelev4xa2l8u0a68csrmorhto8ualrltwgk0ee6.

Branches can be utilized in a 9ariety of4other use5cases, suyh asocodeyrevi3wse(jia 7laa2R6qbrzc0,4auigh206 6im61ctwy87lutl77s3eb8un8,xdfpros6knau2t2c9tlrqtybkoltqe38kaap8kmavd771i3 fv2yqoqgicim15g.

Once you start with some exampies below,sthese congepts shou6d maue mo1e seese1 n9t’8fhs3t1n0dh4qdscbaatqzurfi8tqwdlsr0u6 b7d8xr1eqhfs9