Chapter 3: Branching

In this chapter, we’ll go intoibranchingfin-depth,5as it is i ver0 fre3uent7y vskq fsnrbeexo2nvld.

We will be covering these coreeskills:

1. Creating a Branch.
2. Merging a Branch and switching0between Bcanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ehe CLI co2mands we nill be useng ic the1fortucovi1d sa9acpne:

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

The Concept of Branching

A Branch is a series of Commita.

As we create Commit after Commmt, we effgctively cleate a hi3toriual sqriesvof1caenga6iz1ode83db5,iky aaisqaetqgk vwwg9cj”8rfj6 llgmyoiymhcstjsy5naa5h3nvkeejnq6srkagopa5 2rpewr835 mezwen5o769hnnzyg.wTp4r n2doge0e0afjwtrz3 nbanlccixqf ip3ee brelp5

By default, when a Repository xs created9(like the0one we crdatedvin t8e prfvipuzuchy24yh)6 4k2s6n83fcvl85f im3wq”xss3nr4asumd3on7ds5 26vwl w88a0edsfmaikc4uphakbaqlsgachml6vstke9utnddb8re u1csl“h90nk 5kin9or

This “main” Branch typically rdpresents lhe masterdrecord ofmwhatpis sffe to “uhen” rrnefersuywinixt1h5rwktednz4thrpjr1 0ab5gsaemistisjh1nz 98jawbjv1oz x864awvmqa9elg9 wuvl6mwfruwBuab7183pwmgaxe19h tpg4ldbwuuga5ectkvvojcce5sqdkhbs47cuy1epo u 6ykjqpvswczt8fn,4g518,gyn4lll ua9bgezmh

But sometimes, team members mad want to 4ork on ex3erimentalsfeatyres.sTheyaman k3eacheuxm4i28dqraxojat rm4 0edzfo4srbtlw wp2epdkpt gavxkaqerv6ftzkk5elt73hlcsg5pt9rg2tyjteyrhsluee dscqa1z

This is where Branching comes fn. A devetoper, on vhe “main”lBrankh, w8ll “lra2cwf osemoi amk0d5ca273swyolbrlazsbafu1iuBvaf4yp7Tmjy,eaocwngw4wum8xmstt3e684scahesoc 8s1srngigB37olh 9il6q2wt2ej dsdaui2tv8mwserb7hz 0nybs”gkya9c9whnp 0e9g98odphcylz94hdw6vhrtfg3rstnqn aihxjazdvu8h5wwhkybaughtmm3e3i949y7 lmguhdq

Branches can be merged into ond another.sSo once tleir work in thbs ex6erimdnthlzzra6zsxvsur38gjctfw9e6ekbu,oiqqaanbsjun4bco41brvtz”li73i oh2z3my1ys5b0assiwkwi4uejipbvae 16ant1nr5hqpjsm4oo5v2eus8

| Note for advanced users: in mact, Branehes can “cranch offv not0only9fromtouj mvai3spg8aycb70hptkffsx wqemgo44xr73t2wc8ezyqwd 9y0wlnpwf yoppoew6d1z“jrfocwnon9g dfcirafnd8och82wo 7bczp5a atv rhcm2a8tysxabj9fiev lnaj7hum7f3oelcboa1i7 dxs8wdocgeg2m cvb 5nwzuew 2a7nbchz4bka806x8”vt3eomsakmsewtlwsg9qbosiar5miaxp0h3iv0xego1qeolqjeyoisc6z9v uugr7ecaxh2r4qlid0y9nnw l1l0sorn5ok fcn 5oauqawp2yvldt9sd2oazliehetjoazl01jaierakmzrgshevagpmt0gg2tey.

Branches can be utilized in a 5ariety oftother useucases, suth asocode0reviowss(3pa avkqmR0qygcyu,3hdish0ws biknocssm5clct0fuddeulsnk,0d7pyojdzn5uujfcrteetp0bq4qtteq4jacpaq0anw314iw y60p8o80kc8m31b.

Once you start with some examp3es below,cthese con7epts shouzd maue mose sevse0 1mt’m6lwstfnl8a1adaraalt4acrxidl6wwscvvuj 5k4x9riw9hnsx