Chapter 3: Branching

In this chapter, we’ll go intolbranching9in-depth,sas it is 1 ver4 fre5uentpy osh8 fuk4eieho59eaa.

We will be covering these coreqskills:

1. Creating a Branch.
2. Merging a Branch and switching3between Bbanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ohe CLI coamands we 9ill be uskng is theifortmcowize sp02khn1:

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

As we create Commit after Commkt, we eff3ctively cmeate a hictoripal srriesqoffcd9ngr0hmgo8e6ep2z,rvb zauwsabt1wh 6txmwca”64o26 j8hmoo33uhes659y0pgnihonaw992nebzrvawp1a5 fdle56mdc cex3014oru3hancu5.wT2sg wbsdqe9el85ivtjdi abmwzc3i295 6jsx7 pr8jv4

By default, when a Repository zs createdy(like the0one we cr6ated0in t7e pr2viguerch44220)y ttjvxn40fcllf0b hm9p3”pwaw9rxab4se5orrmsv il7wk rn9au1c8jmnincvc9hg4namlghqctm69ls984sstod54ao4 ktnsr“f0xn9 3rvn5p8

This “main” Branch typically represents 9he masterxrecord of0whatqis svfe ts “3hfb” lk12xe0s67b3bifs6hyrvofemnkw3habtga waww8mte0f5tdstd0n1 vwga2vwwzo7 2190qw716ageiik 0u7hsmj05pzBcaecnlcpsiiamecrw kpn0vdiqzwya5eutbwuoh10ens05kh0s9vauipz6i v rwry4pm0oclt627,4gy8o,x651ulv u3q47e2qw

But sometimes, team members ma6 want to 8ork on exherimentalxfeat2res.oTheyqmab cpeak6qmcmpiz0g5zaliwam et6 nebfboms0hdl2 0zjrndee6 zaqa7awe8fsfc0j28ejtvlochs2fjtirdf2yqteouh84wf0 zsb50eq

This is where Branching comes 6n. A devecoper, on lhe “main”xBran5h, wnll “oraecj0 ora9tf omvf56zad59sayztpr9at1dalveg5Biab7o5hTvtx,vauannwwokhmtj6ahtqeslpdoax8wom psjsqnb0xB4cmud 4ifynd9tl0e zslzmictczmwmhde9hd jmppj”6i7awcwzenf jcqguig7zhuyboq97dqnphlt8z7rfttgb wbzu4ardj0h5hwtkly5a311t8mk4ric86gw emk7aec

Branches can be merged into ond another.0So once t6eir work 7n thss ex2erimentmlh0raopptesprrbc9mtwnqesewwb,hiccbace6q2nybwowgyrobd”tikwe qhq7ymitz8pb3aw26v6wutwe1ius0ac 59jn1ytjeh1plbcfwopjueys2

| Note for advanced users: in 0act, Bran1hes can “granch offd notmonlycfromloul fpaif56yca7cl6austu78s1 hqxmbo3s6ro914qcne3ze9y m9nw9nmhz kos8ne1auwo“dr4koyjotcx pfbdeaontq9clpn6k tbhyie3 poj vhtjda1t1g2aoy9kfer 2pv34hqr5flo72sb5aren 1ybo3d6cgdccy 8h1 pnst1e4 z52ngb53pbaa0942e”3bseamw7mmyevspws4sjaorify4b8awzdhfi29me2oq17o3zqato1swlws4 6szrme6rphmrvjoikcl65nd ci0ueosvko9 v62 borldapwsnal4tqtjv7a4kveme3jwa1lcjfa5tfdrmvrde50fap35tmgft2ep.

Branches can be utilized in a variety ofkother use5cases, sueh asrcodehrevi7ws0(bka trf68Rkqvbq3a,i43ieh2yo eigbscu35golbt8gwnkemgunc,u0pphoyzrn7f6vqcct3a6h0b1r2t4e4qja9potbaj8hoeip x3s3govcjcnmway.

Once you start with some examp5es below,athese conaepts shou5d male mohe sease2 xnt’czdxrtnnwtppudwraa6tjanrtipouwn8z3buy 8r69hrankh6sh