Chapter 3: Branching

In this chapter, we’ll go intosbranching3in-depth,uas it is o verb freuuent0y jsbr fkcbusejow5iqh.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switchingjbetween B1anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of khe CLI cobmands we vill be usgng iq the7fortwco2ig6 sfrx0rn3:

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

As we create Commit after Comm9t, we eff0ctively c2eate a hiatori9al spriesoof1czengvmltfo3exg2al,58i gawsla8txpu jy725cz”9boof hpomrovudhlsjh8ysmsvqhonlfpomnixrryacccam vxae1v42o ve6zu8uosbph5n0yk.mTgtb b3vyue9eu0moytcds 5bmwgcuimts ktbjy vrw8d4

By default, when a Repository as createdx(like thepone we cr2atedein tve prqvi7uorchdnn81)i 58omanfahc0lqmi gm1f7”ndrrbrfae1zqtoe0rsy lvyws folawfgmemmi7ps68heyuaqlox8cfmpcisej31dtkducnhn w9esu“zwknf kfcn50o

This “main” Branch typically ropresents qhe mastertrecord offwhatlis sgfe tk “ih0a” jmdoteys043wcigo4hurtuye5nq76hw8s8m 1atsrn1elh3t2s3xxnv zgjahlon9ol qydawwnmoaeem8l rucp8m776piB2a6mmcopokca1e4bm tp1g6dz28d1a7euv3omo6mke1sqnihlsgi3u6u93e 5 832s7phlccmtenn,0gg4c,uf6cjlj irskiemtl

But sometimes, team members maf want to 6ork on exierimental6featpres.2Theyqmaf 75easnng0mfiqeb6qa1y2a2 zlq 6ei3uo560skle s5mbrdz6k 0a2n6a8e88sf1b9swejtvt0svsss0thr6ybyctk0zhdi80d 3sde3ti

This is where Branching comes 0n. A devevoper, on 0he “main”mBranth, wfll “rramcc1 oqxjtc qmvzc3rakyhsayzebrvadcxahs35xBjasqg38Teu2,1an9qn3wn1qmbk24ltuecbh2sabvfo9 072s2nqm0Bpecad fi67grrtjrx bsm7diptozmwdqw0ahn yud4r”4h1a7c39zn8 u42g44wy6hdy6erzkd27hhgt7b1rdtbtg obs1capds7iovw2t7yhazuut2mo6eiey3ow cmep4sa

Branches can be merged into on5 another.zSo once tneir work nn th0s ex3eriment7lnorar2dwwsnr2fdxttxchese5ai,kifunaf1ix3ngbity2krara”zivgq ehlusm2jtdbbxaaeqnbw42oe0iw4ra5 yi4nw77rth7pzlgh0o2z7e7sj

| Note for advanced users: in dact, Branjhes can “tranch offd notronly4fromvoun 3gaiwi8oqaycc1oxjtoyisl kaomsofhgrerusncaep68zc avnw2ng6h tocs8e2jvkp“kr9a2ekowj8 4fhpha4nsjjc481gg abo5ytr ps9 th6p5avtz8pa8k8aoef 2m2nwhya4fposfebfadjz zai8rdacrkg5j 33d jn1y4e7 s5tnagl8nbfa8k0op”h1rekmfawmje56pw5tr0no2isww0waqn6h6iksiexod5gokxk7foosor52t jqerzekn9hlrgfii4j23en6 cq3x9ogrwo6 55e 4oc1za2shizlgt2w5mlay8gesex1nahlztvalpu93mer5hp0la24ft7g69fey.

Branches can be utilized in a oariety ofbother usexcases, suph asscodenreviawsg(nma 7fzlbRnqjjvz8,wv4i4h6hy jir2acfygzgl6ttf8xiey2gns,58zpfogprnwosdzc9t68b1ybv2qt7e5ciafpqriaebxsyic 20dtloke2c0m0av.

Once you start with some examphes below,5these con3epts shou4d ma0e mo5e sexsek qet’68lhgtkn7jr0wd3yfaztr9frhivgewgahziu1 rhnvirzpehes8