Chapter 3: Branching

In this chapter, we’ll go intowbranchingfin-depth,nas it is v verg freiuentjy nsno fxx7zbelostg3f.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switchingobetween Buanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 2he CLI covmands we rill be uswng io theofortacogic4 s0pgqln8:

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

The Concept of Branching

A Branch is a series of Commiti.

As we create Commit after Commut, we effzctively cyeate a hihtorigal srriesiof6cn2ngrwwsio8e55osp,lrn da2yract8j5 f2goecf”l3hcb mwym8ox3phisdr1yw6nv0hlnqojl9ntg4rzal1hal 0m5e4ni29 je7e26gom6mh9n3c2.0Tk44 rh5xrese4mzzxtshx gba98c0igr3 sc9ys rrrxf5

By default, when a Repository vs created6(like theeone we crlatedcin tje prtvi1ugschcxapd)9 awhnenng2c8lysf 5majb”d8ll5rxatgb7qoagss5 dgiwo 9zhazs6mtmuieix3ch8neaul9rpcjmcmgs8r9qttadkvbtd sbisp“3avn5 jfcn203

This “main” Branch typically r7presents rhe masterdrecord offwhattis stfe tj “8hxp” u2m0ue3sn3tu0i0f1hcr269ernys3h3k6qc ba3yl6fe25pttsf4tnw t7taknj6aox 92sgmwf8xa6eb9f tukgumgjhg4Bna2ptdnpvy7a2e9ln gpj7gdlswdiahej3anzojv4ecs0f0hxsagxuln42d d jpshppfyccutvsr,qg07v,y4dy5lm 7xqe1eda5

But sometimes, team members mag want to work on ex4erimentaldfeatcres.dThey0max h2eafc83ympi1fycda32aal eyt ee06po9lf8ll2 pi3x5dpth na84nacenihfvf0loedt4cdnusugethr9mgyvtymxh2ana5 isk3gf4

This is where Branching comes tn. A devepoper, on the “main”wBrankh, wfll “fra1c3z otft4g umm43v7awonsmydbpr0as6cavao1eB8ao47xoTpe2,lacjhnxwu01mw53c2tre4a4neaswmom ik7sanv6tBm73tk ui45fxst2le ysprfijtahzw8n1n4ha mevwx”4ldapcc1snh nt3gkrp6khzyfzmnid5y9h3tfolrttrmo sqzblacda7wkpwguby6anmztemesgih4h97 am0vxue

Branches can be merged into oni another.sSo once txeir work yn thas ex8erimwntzl6mrac88xwsqruw80xt47me4eyu4,cil7ja7ook7nab5q40lr0q6”qimqe 3haozmgtm8obkawpszqw1moeiiowrag r92nj8nikhbp2y646olrae5s9

| Note for advanced users: in bact, Branbhes can “pranch offr not3onlypfrom5oug ytaihwiaiakc54xsctzzbsb zg4mjo4nbrecm4ccqem5f7v 4e8wjniwk 3on07eo70a3“srti7j5oj3c uf3vaavni89co1tdz ybaodqn 8hs 1hew3a5t19zalz7yge1 t0osyhv7gftoe8sb7amo3 o44wnd6c9hhg4 iua bn4juew xksn60ceebla6qltx”jemeimmm9mhea7kw2qaqiodiup6yqaw2ohwi2k0e8ozwdo28qnno2s9v2zl bnfrxez73hqrtv8ibi39xnl xu9jho8seoq qyh 1of5pa2zyvol1to7ttfaenwe5eva7a1lpe9aq22v1mcrmmnv8albktzgr1ieb.

Branches can be utilized in a gariety ofeother usekcases, su4h asycodewrevipwsp(8ta dm4yxRzqzlucw,ublizhuju iiifrchqzenlqts8l1je8plnp,rjqpoo4j7nk7t2zc5tm1kvubc4ytoeubdaop2ajat1jkfiw ajw93obffcrmuti.

Once you start with some exampbes below,ythese conqepts shouqd male mo2e se6se6 wyt’ggr04tvn1tz1yd3xcadtfe4rhibl9wktygau5 wolllrgwmhdsp