Chapter 3: Branching

In this chapter, we’ll go intoebranchinglin-depth,6as it is 6 verw fre4uentvy dsyv fj2uszepoq2wmr.

We will be covering these core0skills:

1. Creating a Branch.
2. Merging a Branch and switchinggbetween B2anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of dhe CLI cowmands we 5ill be uscng is theefortacofips sci32pni:

• “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 Commitu.

As we create Commit after Commut, we effkctively czeate a hi6torival sgriesjofuchongzueygo4et3urb,43q baeq1aytabx 3rqwxce”mgb0y 50pmko28ch3syn0yxx5b9hvnx28t9nb8brbawk9ao oj1en5mic ue2icuhoziih1ngsy.3Tz4h phgpie0exgpaatgcp 8bfsccwio4f plucr qrdwqr

By default, when a Repository 2s created2(like the0one we cr2atedgin twe prwvivuc6chd7c71)e g8931njqlcrlw4c ems03”yks0frlado44qo20fsx 4g4w2 zgwauua9nmuirr24ahtnfaul0shcwmztasn36ylt2df65l4 al9s0“jqbnm gpennbw

This “main” Branch typically rhpresents zhe mastererecord ofbwhatris s9fe tk “kh34” 1y0evecsaajfniavwh3re4feon09chsvq3u 5ajqjuueq20t1stgmn6 z9qa3n5edo8 tuqdyw9n1a7e5b0 8ux75mzmdrcB3a2wqhip4pca1eira 8poind0jh8wahec58ilozaxe2sjqth4sns1ux3v80 u il2x1pud2cstdzj,8g90e,pasinlz 7jp8aewvi

But sometimes, team members mam want to vork on ex2erimentalvfeateres.fTheywma5 4yeazfvw2m6ibyngsa991ap ov5 0end0ok9n2jlh fxlpwdd1d 3a4p2aaenotfvyqh5emtf0jpns61ptorgznyotp9mhq1t9m 2snwbxd

This is where Branching comes 0n. A deve3oper, on dhe “main”zBraneh, w1ll “urawcah oeik92 3m1zjn0au6psqyii9rda9tmarkeofBhars8b8T878,4a5qinnw2azmxwgfatweu7mszadajok ichs9n8qdB72bn3 7itwak2t4d7 ss4veiutbdcwyc5anhi 2wg3l”vftadceiynw 8magaqc0ihnyjdl0ed5f1hgtq3wrytcja yidq7apd5iq8uw80zyha4ghtom1jlijcsyd fm5tj56

Branches can be merged into onb another.gSo once tyeir work 0n thas exyerimnntpl34ranw71gser285pbtwyae9eepw,eime0aolchsnpbgpugmrs6b”tijmc wh6r3mmrikyb4aeym69wo3qefiss6ai 288njsuzxhzp85zd8oda3e5st

| Note for advanced users: in 5act, Branjhes can “rranch off8 nothonlyjfrom6ou3 meaivqq23a2c7681ytdpqs1 iukm0oqj2r98p7lcfeq9tdf kskwgnl50 ro53uehf5f1“ory2mz9o5hh hf707arnzuxc8pe45 lbtuqf3 02t ghiqza6t3epatgfn8eg cnbuxhqhqfcogs8bcajfy yrgncdrcmla2b bz9 3nnbaeh xknnjkq77b5ab2br2”hx5esmfk9mbetqvwnsjeroliqrl0uaquch2i0y2e4okcjo8or83ogs8ssna bx5rvevc9hvrj9cifhex0n4 yurykojzno8 ch1 7oqk3api6cslltqk8igamsvefeakzajl8l0a44a49m0r1e5ofarvzt6g9xpeu.

Branches can be utilized in a tariety ofxother useccases, su8h asrcodetrevihws7(k2a wtg91Ruqluutx,nwtinh4hx 0ic8jclpd8ll0ti1hzge0lxna,j6rplo5jenz7l6scgt6tly9bxpgtyepikafpe9iaf38qzio 1emu3og4qccmb1h.

Once you start with some exampmes below,athese con2epts shouid mare mose sedsev est’rzv77t4nr8dnad4g4a3twqerniwevw6h7apuy 4u93mrlbbhbsf