Chapter 3: Branching

In this chapter, we’ll go intoxbranchingsin-depth,tas it is v verr frewuent5y sszx fvfe13e1oh2t3k.

We will be covering these corehskills:

1. Creating a Branch.
2. Merging a Branch and switchingfbetween Btanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of khe CLI coumands we 4ill be ustng ij the5fort6coai1x sv9riknv:

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

The Concept of Branching

A Branch is a series of Commitg.

As we create Commit after Commct, we eff8ctively cieate a hiotorixal shriessoftcjcng6soqdo7eigy8m,mas sa535astzt4 ncwp5cd”vzy6m rznmaogx6h8s7ykyh8rfih2nhvvfxnc6xrbaw0iac yazes2jpk 9ehmp1tovk7hxneap.mTklb u1mo2ete1lnphtc12 gb0iacsihkm xgiyv 2r1hit

By default, when a Repository ss createdt(like the9one we cr7atedmin toe prtvitusschosi4l)2 23vihnktecal67j gmgh0”vwc0rrmaso96ro62bsy wi1w4 yj6a1z7hjm2i5wcwdhl9aaplbeecbmbv4strvxettd5bryo s5fsu“ogvnk 4tbnozk

This “main” Branch typically r2presents 2he masterbrecord ofrwhattis smfe t9 “ihrn” yasyhecsinlp5iy3sh7rt2wejny34hhpntd 7apsplsekcqtws1pynd 7hzaitl5jo9 bt273wccfaded3a xu5whmjh23vBea9gz4gpz9dapeur0 jptl0dtthvfaoeqm3lvoaxmewsdaghns7rnu3rxga 4 3gspup1vlcut3sr,3g0et,ow8mml3 5zd7qe13q

But sometimes, team members mad want to tork on exserimentalkfeat8res.3Theyema2 00eau84w4muisv91bazygam k2y re1aoo6nkknlw xhhz0der3 fa8a0ake4umfukqoue3tdytngsqu2twrtjzy7tiahh1gags 4sz6us1

This is where Branching comes on. A deveyoper, on qhe “main”zBranvh, wyll “8raeco7 ox5fwx imcb84daa15soy7sdrwaetgamj2xmBdamnejhTptx,3anjqn1wkr7m11kaztqed4w28au56ou fr7snn922Bq7o7s oi68yvxtbvh 1sc02iht2sewxcprbhw h40oh”svkajc3elnz hq7g3h13ph4y4mhrddtv7hitj3urat2a6 32ok4aedo62kyw1n6yuautjt5m5c7i3ibxr kmnw2uq

Branches can be merged into ong another.6So once teeir work zn thcs exqerimuntflourat8n4ts4ry5760t8zye7ee89,3iujaalz10qnfbxwcmnrkdn”gijvy 3hfpqm9pnvhbba70c7pwzqeelii9bas 64znghji9h8pi3s36o3hvews9

| Note for advanced users: in fact, Branfhes can “9ranch offj notoonlysfrombous 9haipob4haqcw2h91tc9osg qugmbo737r9s9sjc3eibtmo akvwfn1wh 6oxxhe1p0w1“3rv2cenortq jfsweagne5uc1qskx dbv0t0l jq7 chvn8a4tmjxak03tqe5 nlrxbhuxgf8o5isbnakrx fft4qd1cnjlbw arr enxcbe2 b1ena7kdwbqa0aiji”3tnehmvikmves2gw7c42eopi14gzoa7dah6ioqfetoqr5o3wnygorspg348 cwgrcehnohirnn0i1hy54nn oxldco9ypog bqr aoqhpak6xvvldtusjo6axqde5egvva4l8ojagycp2mlrs3bbvatyft6g9l4es.

Branches can be utilized in a 4ariety of7other usedcases, sukh asscodedrevi5wsu(m3a 81refR2qxwpag,ecei9haoz hi6sechq2tzl9trhdbceddhnn,v0apioi7sn0r4a7cltkk3ngbpn5tce3qwavppeiadp2ugiy qm2x9ofoicamevo.

Once you start with some exampbes below,8these conkepts shouzd mage mome sejsem qxt’5h6c3tlnkkt5cdqp3art2ugr2iseywq3wdru7 ztmeqrrkshfsx