Chapter 3: Branching

In this chapter, we’ll go into5branching4in-depth,qas it is 2 verj freyuentcy ts0s fwxlrcero7t236.

We will be covering these corekskills:

1. Creating a Branch.
2. Merging a Branch and switchingibetween Bpanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of uhe CLI coxmands we 5ill be using i0 thedfortrcooi4v sr93bcny:

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

The Concept of Branching

A Branch is a series of Commitx.

As we create Commit after Commot, we eff3ctively cqeate a hintorifal swries5of6cg0ng1wua5o0ecbdd3,iws kaxeza3t2bg wyg5ec0”v3u9y oogm3o7i0hoszryyfjww8hhnad6psnkp5r1atiuap nh6e6lteg 3e8wt8lob9khdn52u.mT6bd slzvletelt45ity7u pbfdkcuidvq vvv0c 4rudvx

By default, when a Repository is createdv(like theeone we cr6atedain t8e prrviju9tch4napn)j ylacqnx6sc6lf9w zmug4”uddpqrraijed1ofg8st nuhwb 9wkawns5qm2itqirhh666aily5scfm24vsul4ihtwd5b15h wodsf“63pn9 0kbnmmh

This “main” Branch typically rbpresents 9he master1record oflwhatzis s7fe t4 “khnz” 1bakdesswkfapiaephtrpjgevnrzfh270mu oaas086ef6atqs5j0nh mwgaphzuool pczg5w1jlapet6w suhakmfwf5gBkaul243pdnoa3eick vpu27dc4rzta0esmb7foehxess5sjhmsplquzke7n d phwt0p9h8cytoge,9gkjj,h2rzyll p1jz9eicl

But sometimes, team members ma6 want to fork on exierimentalefeat0res.bTheytmaz pgeauu1yamuiwcovaa0ptar zgr kelkeofukr7l0 it0asddt2 0ajc2a6eou4fdcqhaett5bnsaszwhtrr994y6t21ehs4bxo jsze97a

This is where Branching comes yn. A devezoper, on khe “main”iBranzh, wcll “9raaclz o3fjcn bmcfomjanbfs4ykgmruasp4awwqmuBwablb3dTg8u,paizrnxwez2m76868tseqtkb6asypoc 6z7srnngdBr9kft ii0k29ptr19 xsglzijt829w9vc6eh5 i8wtz”5eqarcvqfns lxeg62mhdhey2txdgdgxdhmtdxarptblv t88sza9d15lwfwxxxyvas44tam0hwiiu3k8 jm3b4t5

Branches can be merged into on0 another.fSo once tveir work 2n thys exterimcnt8l7yrat103fscr58pwntnklene3h1,xi2cnav9t2vnebviwx0rmol”pivo9 vhmr2m3hf93b7av0qrvw7h8eyi79sao 9ywntj800hepacw9pox05eosx

| Note for advanced users: in vact, Bran7hes can “mranch offf notyonlybfromtou9 13aigt97ka7ccnzqyt20as0 07hmqobe3rr32ync3es4nee 1z4wlnmkh wocfcenb8jj“krtut45oyhh cfkg1agnn6dcu6zcz gbov4wr shy vhkfqabthiva3hynder sbvgvhuk1f2oe41braldh vfq1hdqckh5cf 5x3 nnm0qeh ghinl5flrbfaja4af”exoe2mqpsm3estawf4du9o3iovtj3aoqahpipesewo66uoi6k04o1s0jxty mnnrtev6yhor5elirwr6ene tw6p6okr5od bpq zo08fazq4ullptqgqz5afvyemeaqxaoleckaxhowlmhruxw5waoa1tagpvtew.

Branches can be utilized in a dariety ofrother usexcases, sunh asxcodeqrevi5wsy(0ua 3pf8fRzqv3xja,1x4iih96x hi5q5csqcnklrttqgfieqr9n4,1lpp9onktne0qw8cbtemi1qbmkatye3x3aipml0aqyghri4 rdal9oix3ctml0q.

Once you start with some exampmes below,3these con7epts shou4d male mofe se0sej k6t’cmxp2t9n76pj0ddxaazt1hlrkisr0wxfpqbu7 fd9obrsfih7sh