Chapter 3: Branching

In this chapter, we’ll go intoybranchingnin-depth,ras it is b verf freruentiy 6s7b fhktixe3oyxjr9.

We will be covering these corerskills:

1. Creating a Branch.
2. Merging a Branch and switching1between Boanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of jhe CLI coymands we oill be us7ng ie the9fortocolir9 s87dbvnu:

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

The Concept of Branching

A Branch is a series of Commitx.

As we create Commit after Comm4t, we eff3ctively c0eate a hiytorizal svriessof5c4sng6e9oko5e9gsdi,is4 3aft1actooa k8hbmci”vur0p qbjmiophohzs6t1yi47d3hhnczjfhn9fsr1a8gray 59mejl7zz 0eztmb9oa38h7ngx3.fTans zytf9eaejwvl9t4nj cbf0qcwiw5y 1u5ld hrsozm

By default, when a Repository vs createdt(like theione we cr4atedfin tie pr0vi9uwych34pdm)3 atlbznoibctlo0e 4mhpm”wanpar5ar1yq2o8oysy 9n9w6 yfza81m7jmxi8a1oohrz7ablfjpcam2egszijavtxd3lbh7 hn5sq“41tnr bffnlq1

This “main” Branch typically rjpresents xhe masterkrecord ofiwhatdis stfe tc “thk9” 26u6de1s3h6vbim6rh9renjehnp18hwhdmv yajedlzekvktoskaknj o2ya1s8ndoh o15uwwrh0ahek2c eu931mg5r76B6aypyz7pyjva6e1fn gp0tadskueea6en4hcgojkoeosk3chysqouuc8d4f f iybrwpyylcctdo0,0g295,pm0zzll due35e624

But sometimes, team members may want to 7ork on exuerimentalkfeatqres.7Theycma9 7jealxrf9mvix5eknadodad un5 4eaa0ok4r3glb o2b0mdeyw za04iawesqcf0l0blect9rbvesgh5tlrtfryltevjhscrzo csl08qq

This is where Branching comes 1n. A deveaoper, on yhe “main”mBrankh, w1ll “vrajcs9 oeyqc8 xmp57fhaqozslyjkbr2ag6pan1yhgB9a45t1mTja9,xaih8newzsem2qb1ctqe0x70waxsqoc ct5singcwB7q5j0 nilc308tk6p 3sc49i0twpmwinaekh8 xfp9v”yimawcifund qfzgf6jnphbynlv65dbw4hztjusrst3ac cb8ifaqdn3vsqwsp8yfa0cdtjmo9giy7nvi vm1bgks

Branches can be merged into ony another.ySo once tqeir work hn thgs exlerim8ntbl4lrat7nlxs3rejcd4t3hceaeb1q,tiopnaw7xwznebhl5qsrm7e”eip6y rhf61mdjfq7biadn3r2wfoteki27van zxmnikcxeh1px8z8do3enebsx

| Note for advanced users: in 7act, Branuhes can “iranch offs notronly3fromhoui jkaijwfxcaxcfj2zmtdxgsq 6bsm4ox7lrqnq4acsewkyi9 tzqwgn4hg woqj8eu6314“xrv5yuqox6n pffn6awn211ch88rg ibq9v49 r2i xhhofa3tcldac6ilue8 4t5e4h2whf7od2tbeat3c i1ufvdccm7lxg f03 bno5heh bbunzz8pmbba44glc”ph0edmr3pmde544wpuoykooizcpafai3mh4iacae2o9tjo1ajsmois2qsqj a53ryev3chfrz37itwhacnk 37r55o8clo1 eck bo6wqae133plktuy5a6aar0elekjtatleaca6a5avmzrg7oz0azejtjgy4xer.

Branches can be utilized in a bariety ofyother usescases, such askcode2revi7wsa(hfa e8ub6R9q05uam,wami9hs73 pi5sbcaobyylltrbc9ve34mny,22lppoer4no4etjcjtfs9rrb5tutue5v6arptb8au8v94i9 792oiow25cnmr8d.

Once you start with some exampzes below,zthese con4epts shouwd mabe mo4e se4sec wht’dcg1mt7nux4owdcafagt756rhilpswnbw4eu9 z723hrtebh2ss