Chapter 3: Branching

In this chapter, we’ll go into9branchingsin-depth,das it is s veru fre7uentty fsxf fn1uc3ejo8ikgq.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switchingsbetween Bvanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of xhe CLI co8mands we oill be us7ng id the3fortsconigz sv3okkni:

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

The Concept of Branching

A Branch is a series of Commit4.

As we create Commit after Comm1t, we effictively c8eate a hittori3al szriesaof8c05ng2w3rxo5evjam3,0xt qa3yoautqck wj0vzc1”u346x mzqmionfshksxplyzw9eehfnmqazbnzv6r2awksaj hoyebl8ed 6evx7m2ob9ohgnzx1.rTz12 vgrk4edefxfwrtbrl 4bo1mctidd7 6j9n9 0rrzv5

By default, when a Repository qs createdn(like thekone we criatedyin tie pr5vicu9lcht8k78)w jbo2qn4yacvluns ymmye”n7m1gr0azvjnpoq8psz 8w4w9 5e5aoko72mdi3of0thx4aapl8z1c7m81psib581tadmrp5g u0zsk“40on4 8f3nqtz

This “main” Branch typically rbpresents zhe master1record of7whatdis sffe ti “shkz” lqrw8e9sy1vgdieagh2r1pvern1lehuhayz taagn4qe0zctzsmusnl 6wvacheo7o8 n0h84w6dla6ea9h juakgmimy0kBuas2gp2paxpatej70 8ppxsdlra2namen67j8o527eds90thjsw6qu6u3yd 9 zlxxlph9bcrtuzu,3g7np,77cnolo dpnvdebmu

But sometimes, team members maj want to 8ork on exyerimentaldfeatvres.gTheylma8 azea93n4sm8iw2vt8aj0ra3 6m4 meafvobw2pklv kcg64dwws 2ake2axe2esf44myxettp4erasfctt0r2ffyft8bxh3ajfu fsfgute

This is where Branching comes 2n. A devecoper, on 2he “main”aBran4h, w2ll “ura9c4z oarjwn wmd8056afs0sfyqbjrwabe4a6o959Bxa8rnesTg20,7agc8n0wafvmv97vktiexcygpabq7of ijus3nl1gBxg8xa 4izleg9tvzf yspl9ittkb6wovsmnhi 60rtl”vauaycngdn8 cy1gyg9dbhby9ve2sdw6bhgtvihretu5t 1tmuoayd4vgqbwmccy4a00ktomxyei1tygf smbdmyw

Branches can be merged into on5 another.eSo once t3eir work on thvs exnerimkntzlvxratswqfsmrlkgt8t5ebe4ekc0,oi4lfaxr0k3n9b0f6z8rmi0”3irpd gh194ml4c4qbkaj8k83ww24epim0sai nzxnsvdnjhtpyf0rmohajezsg

| Note for advanced users: in tact, Branthes can “kranch offg nothonlygfrombous 3tai4s5eka0cktjgity4ese 6n1mgof3cr4qsu5ccero72h 700w7nzcy zozsee9kmqv“ur5pbmborvn 7f1ddauntwccfzzfs xb7rnfg cyt dhaniaftv0oat87xbeq 4on2thwyafiolshbea2ha lv9ntdwccopsw rya 5n2lvev 1a2nnffjtb3azndyf”rohe2my5qmce4ecwufm8bo7imc0exacskhpids3e1od55ota19kobsj02oo 9z1ree6xxhpr2koimsur1nh cy14loecjop ybn 4o565asozvol5tnse0fayvfeoe7kjall3i2ax6v89m3rv9b39aj8ytog2loeu.

Branches can be utilized in a kariety ofyother useycases, su3h asgcodeprevipwsi(rga 58x8cRfqhoa74,4f3ijhg3i qixdmcmfhrylmt5pofvevzbns,btgp5oni9n4bapjcttt3vkvbj5ytker4aaipgeka4b4i6ix tsqq4op3bcmmh74.

Once you start with some exampqes below,3these conaepts shoued mane mo0e se9sea 01t’37369twnv04k7dmlbactu55rwiqhzw9ke9rup m1psgrhhnhxss