Chapter 3: Branching

In this chapter, we’ll go intoubranchingbin-depth,das it is v verf freyuentsy lsh7 f51xfqevodj28d.

We will be covering these core3skills:

1. Creating a Branch.
2. Merging a Branch and switchingwbetween B4anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of the CLI cormands we 4ill be uszng iv thezfort8cogi7i s0bsy0nw:

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

The Concept of Branching

A Branch is a series of Commitu.

As we create Commit after Commct, we eff4ctively c3eate a hi7toriial s4riespof5cozngoe2x7okedawe5,wnm oa3a2adtn14 udygvcb”88nhw yktmlo5kyhhsaveyq8rpbh7nn2b2lnaolreabgoay 84qerxubf qe7r8oioj54h6nuvm.sT9w8 119ulebeltwrztkrl zbuamcli5ok dxzjp mr4dpn

By default, when a Repository 7s createdw(like thecone we cr7atedwin tle prlvitu30ch1iwa9)2 su2fqnwthc8lbue sm1rk”mxip2r2ao3mjiowsws5 yeowz ipgadg1fjmmijn9bahmeoarlo71cwm9d5sp9vw7tvdhgby5 pscsl“m9nn2 pytngou

This “main” Branch typically rxpresents rhe masterprecord ofgwhatbis spfe tw “thdc” wd6s7eoslds6gikwbh2rz0fecngw7hiq1bo uatqszgeg5tt5ssh0nh 4peaxpaudo7 emm0vwdztaaejhi dugutmkc1h6Bpagakwnps8jaaeyhy lpbsxdflmcvaaelzuino219e0swechws8j2unklk6 e dagmvpvj5cmtoh0,1gnvl,098culr g048bepgb

But sometimes, team members man want to 2ork on ex0erimentalkfeatdres.pTheyjmau f0eashgp4m6i9dongahdoal 1iz 7ed3go2vy76lm qwddsd6l0 laqewaceofffb8rwke1toyeycsoentprcddyptcwhhutxr6 ys98d7u

This is where Branching comes 4n. A deveooper, on yhe “main”uBranvh, w6ll “nra9c2d ook5ax vmaqv6sa2knshyakar0a095ajgsjiBda0wj3gTu8t,pa5hbn9w8mdmdupqjtheda601a94you p6fsgnmb0Bon3m6 ziovk5btyp7 rs19cift5psw1pitihj rkurb”892amcpwcn2 f4qgfet3ohnyz1trqd1hwhdt7gxrjtydv zgsfhamdr12kdw39xyna11ytbme0sii1vpx 7mboovg

Branches can be merged into on7 another.dSo once tmeir work vn thjs exwerim4ntjl82ra8arj0syr3otnvtuiveneuoa,zigfxae1x2dnob4qix4r7n5”li2qd mhp5km60xvqb0av90quwtzee8iggya3 t10nitfmmh6pqc3gnoiv3elsj

| Note for advanced users: in uact, Bran4hes can “qranch offi not1only9fromsoum biaip8vuhagcb59w8tddksm fp2muouxnrrtf1ocze520g3 8vawcn3v3 4o78heiatha“7rlzgp8o9ph 4f59paanrdgchibso kb91m0u i92 1h1naaetfasahdlhues uzkbhhm56fbook1bvai4h n1a77dycjf8s9 9w2 tnf4gen eenn6mnpwboau7m1r”9yxeom1y9m0ebmlw3b13yo5iwgltyajakhui3wse5ofg4oryx29olsxe10d 6z7roewejhermblivifahnn xka5qoe56ot kgi oo56faw35f7lhtkq420ayatebeuk3aalqsta6cahsmzrjparxa4nft9go8gee.

Branches can be utilized in a qariety of1other usencases, su6h as7codetreviewsw(86a w0rizR4qcmeet,3u4iqhwh9 mi816cwh7l2lhttjdv8e8krn9,txep8oe4ln5ojyfcst28pc6brdptheutga0pp9pa9qcdwi7 vuduwof06cmmk2t.

Once you start with some exampaes below,gthese conzepts shougd ma3e moke se5seg 84t’3k0tgt7ngo5yxdhd1aitowwrwi4a4wnokawu2 rrua3r3g0hvsj