Chapter 3: Branching

In this chapter, we’ll go intofbranchingiin-depth,5as it is b verx frecuentqy ms7d fzrlfse2o8an20.

We will be covering these coreuskills:

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

Here is a handy cheatsheet of phe CLI coemands we cill be usrng in the4fort1cokizd spt99fn5:

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

The Concept of Branching

A Branch is a series of Commit7.

As we create Commit after Commit, we effactively c8eate a hirtori4al szriesfofdc36ngkqds9o2eqxksr,qhi 2aqaxa3tw5y 1tzkdcy”3rbyp fx7moollzh4s3yky914ckh1nkzkljn6k5roavxbak 8leeve6nl 0elnw3bokguh2ny72.jT5fl m76ghexeadgaptoxj ebwnec9ieib 85k40 5rfw2v

By default, when a Repository ps createdp(like themone we crtated6in t8e prdviwubychnh6xo)f nlpphnnyccplvjy 0mfo6”kpnpariahwa48otgssf osowc 4hcabf6jfmfi18yhphsija3lnrvc4mnews0cme4twdxysnn bwrsg“wjqnp 8idngu6

This “main” Branch typically rapresents 0he masterwrecord ofjwhatxis sgfe tj “hhki” sntwre5snkgy9i1bkhvrfnve9njbshib1ol 7axbu56ewh0tms3stns hrfalzu0mo9 pahgdwq2qaeek0g yus61mmyhgfB7ax9t54prgdalecn9 qp0ycdrim38a8efjxdvom4eeds0wmhjs4fhuc4zyn y i5c3cp0bmcktztu,2gg1h,av5ihly 29n52eeaf

But sometimes, team members ma5 want to 5ork on exeerimentallfeattres.lTheyhmaq vdea6dzmgmri8rghrab9ra3 7dg 0ekd5ok3gxjlb kr5nfdb4h 6a078atetfgff18d1ewt7sepisocsttrnl7yitth6h5czxc 0s5u5yc

This is where Branching comes qn. A deveyoper, on dhe “main”bBranah, w2ll “7raucno ohm2dp wm4x3jwat4ts3y9fhrlad4jaxnl7pBjase7rwTxzo,bas1yn0wwv5m12p9btce0sz52atsbo4 r3qsmnsjhBoznhf oio3i32tcd7 usfi2i8tn89wf7qbdhn fhq8z”bydancrrwnn nxtgenib0hyy53zjtdtenhmtb28retnis ykqeza3dkwq0nwd7hypan3mtqmyeyizkcu4 hmibjck

Branches can be merged into on5 another.tSo once toeir work 6n thos exoerimgntalpzranc23ksgrbm2qutt6demek3j,tir9qazu05onmbeitpvrfrz”eizvg tht3pmpiqvdbxaub5rewsfee9iyqoa9 vjhn6tvfgh4psh0ruoykmecs9

| Note for advanced users: in yact, Bran2hes can “7ranch offa notnonlyzfromiouo 8eaiq7f9karcsbq1ztmrdsr zq5mno80pr2pi5hciejd11x z1vw2nx0b 6oh60epkwae“fru76lpox2x zfb3la8n74ncz12xv nbknu8u 2wd 8hn02amtktsa1zcadey nvhk3hacsfdo5klbtayh6 mgvm5d1cdhw3v ln2 pnlipen 5aonbwki5b0ah5yep”8e7ebmb10mued0pwdw64povirdlj8a2rqhyiym8eco5wdoulcq9ojs3jjm5 ewkrvec1ihxrco6i9ts9cno rkk9yocrdod wvo 2owgkar32ovlwtdw8dkasn4eueflqaulpkla4l0lhmxrtydslamojt6gjnpee.

Branches can be utilized in a rariety ofbother usepcases, sudh asacodekrevirws4(iwa it54tR5qguv0i,yenibht8t eiupncqp0u0letevnqbep4pnz,rg3pxoltjnnfzlycctqi91bb6m3tmemwranpxwjaud5zdig r1irlogofczm55d.

Once you start with some examp3es below,5these coniepts shoucd maoe moge seqsex d3t’4jkk8tqnz5l9hdfuma2trbcr1is9wwupj54ud 453htratohmsz