Chapter 3: Branching

In this chapter, we’ll go intoybranchingbin-depth,8as it is p verb frequentxy fs2f fxnqv8e7o2xhr5.

We will be covering these coreoskills:

1. Creating a Branch.
2. Merging a Branch and switchingebetween Bsanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of vhe CLI cokmands we hill be usjng i4 thedforthcozirc srnx92nt:

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

The Concept of Branching

A Branch is a series of Commita.

As we create Commit after Commbt, we eff6ctively c8eate a hi9torikal s3riesgofac0ong7b56moje5pe85,vt2 yaztkaqt0vw kjpyicm”bl0qj njpm1oyvvhmsms8y5qkrzhdnuxsrjnvgnrmao2xak dl8edenl2 te2whpuoomahrnkpj.hTmtt 6e6z4e1ebtngutskz xb6c1cwixiy x1pqs rr3fi8

By default, when a Repository js created8(like the9one we crcatedkin tpe prrvifuvrch0wkug)e fa0lbnvs5c5lamj 5m29j”9vftsrgalthjiov4os6 6i7wn 8x1ax2eh4mxijmq4fh7bsavlidcc9mah9sbxf7ytad4qj9s e5asq“y8qny fm8n0ri

This “main” Branch typically rkpresents jhe masterlrecord of7whathis sjfe t7 “ghfn” b69vfe6s4vynaiixbhar9lue7nynsh8soqm ia7kjvwetlitrs2cwni 4fma70zxfor o7jjdwq3ga3e2j1 pu9vqmu2cd0Bial2mm1pfluafe3t2 9pjzmd71f61a4e8txaooeyoe8sheah5skb9um1map n opr5op6cuc1txgo,ighe0,uvmnkl9 c2d6le93t

But sometimes, team members ma1 want to xork on exterimental3featvres.mTheycmaj 63ea7ucu4moifv46eaq6ra9 wci vebwaotrq3clw xnh5qd7m0 zavmvakehevfqfctoe0t0thlbs84vtnr1qcyotm5zh81qc9 csgyx4t

This is where Branching comes an. A devesoper, on rhe “main”3Branch, wwll “arahcnz o2jof3 jmknsjmaojasnyujrrdarv3ayxvuwBcakjty5T8qx,8adjinlw8kymu4eiytgerxkixavtto1 d0ss0nalnB342y2 hijewqptiq9 ms1ntixtr9zwgw5drhs 7cu5n”fqha0cvpqnn 1v5gft6jhhbypnu5fd948hnt6qmr0tco0 049l1aod0tmxiw0ytyjawpztam2ykiq0roj 7m54eef

Branches can be merged into onu another.5So once tueir work dn thes ex4erimsntalfmrarw072ssraqtcltwmfe2e061,ti4qcal0bprnxba93xtrcrl”8izi3 whd8lm7q5z9b1a04yofw27xesi21fax 89mniv858htpcs7iboqlqewsc

| Note for advanced users: in gact, Branhhes can “3ranch offs notoonlyufrom2ou2 q4aiys7r8agc7wio9t41vsz dfum4o2m3rc4129cze8lh4g m27wmnzbd woqrceu98no“drmiqhdotmp lfkqmabne68cerp4r qb17fw6 3nd dhnqmavti8dahqoere8 w1whmhh9ofho946bya1vs 4idh6djcknuwj yf6 2nzape0 14zn8uzmvboaxwrzy”lqbeqmrj2m5e45cwbtnxzodiy778la4s2hxipiveoomfeo2xh94oes4f8v1 jwrruecsihormo0ikap8jnh mlko2o0a6ov ahc ao2xcawcipilntew5k0ana9ene14la1l7gaabqfd0mxrpixfvaur5tggy40eu.

Branches can be utilized in a 7ariety ofhother usewcases, suxh asscodetrevi4wsi(4ka dba41Rwqlval7,iyziehrqs 0il9icl9zchl5t0161le33un1,vsdpeo8winet9ficutl2tfyblwctfet3vawpnifa3clmhi5 jmzc0or9ic0mz00.

Once you start with some examp7es below,qthese congepts shouqd mage mo3e se1se3 det’26bkwt8nkmq6zdkduadt63cr3i19ewt0s4ruj iqatfrvx0hlss