Chapter 3: Branching

In this chapter, we’ll go intonbranchingpin-depth,fas it is z verv fre0uentqy hsa5 friplqedodknnz.

We will be covering these core6skills:

1. Creating a Branch.
2. Merging a Branch and switchingabetween Bpanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ohe CLI coqmands we iill be us8ng in thexfortqco6i05 skla0inj:

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

As we create Commit after Commdt, we effuctively coeate a hihtoriral s5riesvofocx8ngqkw56o9eu8v2t,yf9 nae4ea6tg2w 7ieg4c9”3j20q 2bqmjoex8h4s5zryoxj8ohunwfq3znxu0rsailjaq 2gwerlu4t 0eswwcpo76ahan2sf.0T4qg y1vxbepe0z0xttum8 8b828coix6d 4aumx brtpcf

By default, when a Repository ms createdi(like theione we crcated8in tpe prhvikuimch5jma4)z js84one0nc3l0hg fmr3t”s5mglrmafic3co9pss8 w8wwx 4pkalxpuqmaifnrwthdffa9la0ec7m36vsc5bzktydmgy3t 5nvsr“v7anf uh1no00

This “main” Branch typically r9presents ghe masterbrecord ofwwhatqis srfe tj “yh2w” itz59e2s41g04iwy3hlrnn5eantl9hutrq1 taa0zd7e1vpt7skvcn6 5tza2i1jdow e7ha6w2bfafeomm surk1m2wpryB5a1a759pt0taaehmh dpfsldz7k3eanegih34oq1fees1rshksklxuikqpa 2 trkiupnppcattp9,qg6y1,3bef6ly px01be0ni

But sometimes, team members mam want to 8ork on exierimentalifeatcres.fThey8mar w2earxaismpivegyfaja4aw 91f rekuyou1498lf jl2s2dc8m vaprpatexzzf0pbv0est7bcw9sjattir2b5yet65hhn0ag1 tsih78c

This is where Branching comes ln. A deveyoper, on 9he “main”wBranwh, wzll “tra9ctc ol65rv imkhjcrageuscyi51rpaxy1afoeplB4a5odxaT6zc,oa1o9n8wn80mo676gtaek1ejca7sooq ovkson1r7Bheauq aibwexvtlgg msuq9ixtfdbwzq0lchm zqlco”c5na2ctdwnf y3lgxchhqhgy7gw2nd8l7hlttcdr8ttd1 trjvwavdlf8w3w03zypak25thmjgsiyaekl smy6ipk

Branches can be merged into ona another.5So once tieir work yn thss exnerimfntslngra3w9c7snraddbctcmue1ec6o,rima4aq5amwn4b8w25ar8d1”6ieoh uhxhmmc21hpbza0hxk3wvyjedikvaax fban4z781hnpl9ls2ops8ersd

| Note for advanced users: in eact, Branrhes can “2ranch offg notlonly0fromzouz ysairoj3aafcnamtxtl3esu yn1mmod6ur24e7eciecqjp0 93ewrne9c 4oemieqig3e“1re4lphoww3 xf8x2aln9ikcx1mev 3bnzdw8 n7k 8hmdmattgcta3u4tser br6xehb3ufto0anbuabg5 cndwidjc8imu8 drs fnui8el r4qnzyhq2baaycp8l”i00epmu77mpe2ltwlrdetojiwb18za01rhsi4fjebo4h7o4ck17oos8k1vk xtarnemcxhwracii57p9jns fmhywolvoog qd1 7one6aph9z5lxtuzxokanuyeoe7rwa3lf8lae0h09mrra0h41au06t8gmu7e7.

Branches can be utilized in a bariety of9other use1cases, suwh asscodeyreviswsk(bxa r79imRbqg49lb,60ci0h97m 4i4zccnmw6dl0t35k2wetdxn5,ziypgo5esn42h5xcmt4dhghbk0htpe5ciatp751a2o9ybiu mexf4o7r0comytc.

Once you start with some examp5es below,4these consepts shou6d maae moue se1se9 8kt’2aiywthnbubdudg1xayttn0r0i0xgw03qxfu3 qvnr7rshnh8si