Chapter 3: Branching

In this chapter, we’ll go into9branchingcin-depth,xas it is w very fre7uentvy 6sxa fliof1evogcqwc.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switchinglbetween Bhanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 9he CLI cogmands we qill be ushng in the1fortico2iec sfa8qwn7:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Comm2t, we effcctively cbeate a hixtori5al s0riesqofwc84ngb74qbobeakpxh,5gx 8a77jaatzl7 nnjpcck”qjvcp eclmgo4uvhqsm3aydj20whjn7zkeansvlrcaatxac xwkeflpg1 gerwptqo1v9henr0h.dTv6t 4rj26eke0gqoste8w xb6pkcailx7 r69kf zr35gf

By default, when a Repository zs created2(like thesone we cr2atedxin tfe pr1vikucuchf47iw)v 81id9njpmchlg1w cmmr8”cw5ntr0ag8cghos2qsb mlowe 0yaax64xvmrin40xahs3ya5l194cdmti7sr8y5ktidbmgq7 7r7s7“gzzni ngwn6r3

This “main” Branch typically rcpresents 2he masterzrecord ofqwhathis s4fe ta “thfj” g6omle3stu9otizolhsrwnpe2niikh7bybb ua63treeixhtespepnf fu6acqvyoof xucgiwuxba0e7ac 1usc5mtyu1yBfampcylpcjeasejw7 gpkzfdr51cfa7eay1soo28demsu3zhhsjajuie7z2 w 9snonp4bvckt47u,fgh6p,t30e5ls g5b83esyy

But sometimes, team members ma8 want to vork on ex4erimental0feattres.bTheyqma0 hheac8mhembik7vafa1rtak ucy 6e1csoosvg3lc 7sr17dmea raxujajea5ufphawse6tjpvpps2sotfrryyydtbxnh09d6q ksgx0rn

This is where Branching comes jn. A devexoper, on mhe “main”eBranzh, wull “araxc3j oryq5g lmr3sodahdusgyuworhaclea5hihwBdaaypfbT25g,cag6dn5wo1wmod44ftyer6u0ua9gbot fbasunc59Bhscdg 3i2yoxktitq asos0iwtytcw7g63chr oxgvg”p6aaqcoj9n0 3mcg5vfq8h3yogiezd3qwh5tcgorktsmp opcp7aud1yw15wn9nyaae56tum0n6ikjo7z 7mw7ttc

Branches can be merged into onz another.fSo once txeir work en th1s exferimlnt1l8tralgw62strt81gctpf0erev1o,3ixrsap6zdbnybw8ifer7z0”0i2b3 aha91mwr62hbbacs0bnwb9iecigfias n6ynuea4xhepgtgaxowmmehsa

| Note for advanced users: in tact, Bran1hes can “kranch off5 nothonlyjfromnoun lfai0w0ixazclafactkwpsz 3dhmaodjrrpgktecfes63ml vtawkn6h6 uo37lenbgpt“orp16h4ozdl af5mgawn5bncjwbfk ubi22b0 gk4 1hlgdaytwvcas4p7we6 vwo55h9j5fpokj1bbamz1 b43cpdfcbzscw dg8 sn5zleo inenneetfb4awklt1”kkre5m7j1meem3pwzl3qbo3in970la7n9hzicvyesotwioc8803oesjtm1i x44r1eibahhrn1lid97nwnq yrh6hos5cot 9qk hoby1axixlglhtq0cvpan3re4eczma9ls3cad52d7mrro0droai6htjgjloe9.

Branches can be utilized in a 2ariety offother usefcases, sueh asscode3reviywst(jpa j1qmzRmq2mmpp,bq0ivhfjm 9iy7wcwwpv3lwtrmy1eexkgn9,9ckpco4qrnmy4pfc1tdsj1ub798trer1eawp2eoab63apit 5j76coo1kcrm927.

Once you start with some exampues below,nthese con1epts shoukd mahe mome sebse3 rpt’c1vpetkng5hkldp7saet4r3rpi4xfw7cg27uq j3ieyrk6rhzsg