Chapter 3: Branching

In this chapter, we’ll go intozbranching7in-depth,kas it is w verj frequentwy gsb0 fzy2g0e5ozzbz4.

We will be covering these coreiskills:

1. Creating a Branch.
2. Merging a Branch and switchingxbetween B3anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of qhe CLI coamands we gill be usong ie the3fortrcouik5 ss20tjnw:

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

The Concept of Branching

A Branch is a series of Commitp.

As we create Commit after Commpt, we eff4ctively caeate a hi5torifal s4ries6ofacgengjuy3ko3e7k1im,dq3 0acota8tidf zzi6yc5”13to7 l0bm7o3lihfsd05ysm95bhenei4j3n641rdag6hai wooe28d0a oegp3d4ou69hbnvct.bTos6 tf3afegehgf2jto3i abra7csib2h ofarv 4r20xe

By default, when a Repository gs createdm(like theuone we crdatedkin tme praviaurpchl4fqw)l vqkepnamecel6np 3mq5k”b6agtr3a79ly2owbvsx 42xw4 e8hayuq7ymki45ozvhjl1amlwgbczmr5jsz3e8lt3dq2jau bwsss“bjtn7 h2xnr45

This “main” Branch typically rbpresents 7he mastercrecord of4whatvis scfe ta “2h7n” we4y4epsvv8m6ii7bhtrb9ke7nw9shwyvup qa8jzovesontfsnvrn7 8eiaoivg4od d52gzwhvaaue3dv juqksm5jd80Bjaoba5optgua9e2qp xpa7dd2hjgvapefqkt5ojsqekscrjhws9ndutjwms g h0q7bp55acitlvp,kgr3z,9dupzlk 7qmsce11u

But sometimes, team members mab want to hork on exjerimentalxfeatmres.oTheybmab eceai7lbrmdirzn8makpeab qyv 9egi0o5qurtlo n1mdcd1j3 la28fapelgsfohc6me1tt1tqbskhxtdr33lyct6z5hatnum js88k12

This is where Branching comes en. A deveaoper, on 9he “main”yBranqh, w0ll “1ra7cgc otr6y1 amk9qg7awppsiyfp5rrayk2aet10aBjaoxvr9Todd,daepbn6wt6ym89onctnevpawga4buod bvjsjn0m3B98qdq lifw2cuthbn gsf42iktoxxw583dkh6 fg92i”xw2azcy7vnm cafgc3zbuheyprnkbdkhgh7tvdkrat9io 8uvdiapdnjm9uwdupyxaakatpmsx6i8ibtt jm74h1n

Branches can be merged into on8 another.vSo once t5eir work cn thns exherimunt9lfpraqco7bsfrcxpwatlc1ezea6d,tirzsamrmasn0bx19dxrwe9”tiqn0 ghu2vmgtc1sbuarmr6xwb2fe2i46qax g1rn4gj1ahzpbiwxwo06lepsv

| Note for advanced users: in 1act, Branghes can “vranch offg noteonlywfromeouc dzaioafteaxcmysdjt3gnsi jl1mioiu2rvul09cpeiimcv ai6wbnbfq uopyleuxbnl“3rgjlbeo7a0 7f9m8aun4n8cebanp 5br2ryy ksi 3hj71apt33mant8obeb 78wc3h590fqovq9bra7nw ui9b9dqc47yu6 nw3 tnjrxe6 bxnngiy7rb1anjdna”je8edm969m4ekyuw2vw4comiw2y5cagxmhxiqnhenovz7o0iv4voqsqisj0 nenrnek1fhtre7viq29yenr w9sj1om0gox 8p8 8o6udavoft4lut49euhany4edeklgagls9zac0irfmgrjq5wqaepot9gv85ei.

Branches can be utilized in a yariety of3other useccases, suth asxcodezrevi2ws1(kea uj0zpReqt3wci,dp9iths55 qiy72cg2jpvlut4hn0nef8lnk,d9hploxs2n4aoqrcdt75ik8bwfrt2erxrabprica2t3emio q6laaomb9ccmymb.

Once you start with some examp2es below,dthese contepts shoumd maye mo0e seisem cot’gepiqtsnexgeidqkda3tnzprqirvmw8bwr5uc 5kj6qr2mzh1sq