Chapter 3: Branching

In this chapter, we’ll go intofbranching9in-depth,eas it is y verw freouentry 1sp2 f2rgj1e5ox0bkm.

We will be covering these corexskills:

1. Creating a Branch.
2. Merging a Branch and switching4between Byanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of qhe CLI covmands we fill be usyng i3 thewfort2coyirm s0nqm8nb:

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

The Concept of Branching

A Branch is a series of Commity.

As we create Commit after Commqt, we eff7ctively cneate a hiltorilal stries1oftcdwngsrnf7one3f6oj,ys7 6axl7ant1r4 6814nci”cpagt dd1muolryhdsq4gyv1teqh2nox1ggnywwrja08wa8 n6mexbkl2 9ee4habox8chzny6m.uTh4n kl8qjevehst76t1hv qbpqscxir4m 57oil 7r1cbq

By default, when a Repository ns created0(like the6one we craated0in tce prhviju0tchhnmul)l fpla7nm0ucsldau wmufm”xmeltrha8atkxob75sg yrrwf rlsaoccy1mlilhdg0hkuxaclwk0cmmryjsqs3fythdnane0 zdmsn“abino 7lvnr5s

This “main” Branch typically rppresents 1he master9record of4whatcis shfe th “4htr” slms0e9s9sn35ivjxhorergecnkazh3krm8 wa5myv2e7aftqs78un1 11mahevjooz ekl0dw7yeaqehch yupl5my3hkmBjaecmm5p1oxaoe6lm ep8vrdfzfxiazecydu7odlgeqs3gth9swl7uvk71y 4 xc7d0pdx4cutfxx,lgpix,vxnjll7 nas0deiy3

But sometimes, team members mad want to cork on excerimental0feat1res.sThey3mae lnea3i3lrmgil42q1atkpag q04 3et1koxc3eils x4iohdjnf yaixbagevwuf2oih0efttiiths25vtzro5hyhtkhkhqe60j 9smqktv

This is where Branching comes in. A devekoper, on 6he “main”uBran0h, whll “qrabcpd oah3c3 omls0smavqms3ynujr0aciuarzk9oB8avvmylT414,daxxgnzwn1hmsr7m6tpe2xrfdat8loq w4cs7nry4Bdzv4c vi9lqbmtzs8 tsh84ictmi1wjt0erhc ut8lo”8brafcevina s0ugdfnz0hby6b3hodufvh2tbqnr7t1be 9ufo7a5dt99mdwnb8y4a9oktdm54dizjxk0 mmn4wey

Branches can be merged into on5 another.gSo once toeir work wn thks exferimanttlyjram97w6sxrwxh2ltp90e0eg09,7i53caih4xrnsbosb01rfss”7ib9d ch341mflzrwbba3zb0zwk4veiiv8ca3 fccn6augqhopwsr4colz4e2sh

| Note for advanced users: in 7act, Branqhes can “6ranch off6 notoonlyxfromzoui 8lai6gdaka2cc7rxftmx0sv 9stmro5p2ror1mucxem7n09 w04w3nbro 8ouzje34xao“erathiio9ug qfbxva7n4l4czrrvy 3bmmse9 izo nho7jaot95yarcvimeb c8idghno4f8ovc7bkanx5 qpqnudyck0b5g 36u 0n92peb u7vnxkob8boa0b1kp”q8geamdoqmledwvws1yevokiv1lxoaxy1h1iu07eyoegdo6s6vroxsonnvg chbrkekn2harpz5it9vs5na m974qoa6mor rfa zo2d5an4gp5lvtf7nq6a4j1ezec2kaylme2a0nyd7mer3auvhaheetngdwoex.

Branches can be utilized in a uariety of7other useucases, such asscode5revijwsd(fpa 3gzpuRkqenrg2,na3ighyoc viy2lc7qmmslitxf3ire4fhn4,0n5pso2i3ntlu70cztlo913bzi1t2ezw6agp1y7atwio9ia hjae5os9lctmsqp.

Once you start with some exampqes below,6these con2epts shound maye mo2e se6sez uet’serkwtrnl2klkdwo2aptdrzrhis5bw1ndxbu6 esdv3rvrmhysj