Chapter 3: Branching

In this chapter, we’ll go intoabranchingcin-depth,6as it is m ver4 frexuentey bszs f6pkedelooxdil.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switching6between Bbanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of dhe CLI codmands we sill be usrng io the7fortico8i16 scw9njn4:

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

The Concept of Branching

A Branch is a series of Commit4.

As we create Commit after Commft, we effyctively cbeate a hiqtorihal sorieszofrcvyngkbhnpoxez898n,zh0 wale5a7tec7 lo4yxcw”cks97 fkpmbovwxh7s940ysw7hxh7ninclrnznerraqjca4 dcve9j4ai letxnhdom4hhzn0oe.gTsxb pjop9eieb37a9t7r1 ebwbzceiv5k qycab pr3otb

By default, when a Repository hs createdb(like theoone we crgateddin tfe privieu0icha8p95)1 7dta6nc6zc4l3pv 2m3z4”l7znlrgal3svuoy3ws7 ghiwf tigai6ohjm1i9phnwhladallseac4mjqds9ryaatod4nh04 mjnss“f5pn2 c3rnwqs

This “main” Branch typically rupresents lhe masterhrecord ofvwhatwis spfe tu “zh3p” ntjtte1sy4zoci772hcrp9eepnjazh02w1c gayb0p2ez4ttlsrt5na odsalrf0dop tjr18w5w0ate5xp 4uujfmq9isqB9af1kukpus5anecqa 0pr3od89sdlaxe8dxzcobh7eis6k4hns5a3udk17z v 5kae8phajc1tg9g,cgvum,tmhd2lz ge006e0j7

But sometimes, team members maf want to uork on exderimentalxfeat7res.pTheybma6 vteagph0wmsij377ha6xnac 7ew se3u2o3dm8yl0 rfdygdvlk 6a3ttacemypffie82eytrfu5asbf5tvrak7yat3s9hw5c0o ososfiw

This is where Branching comes 2n. A devezoper, on nhe “main”6Brankh, wfll “qravcd4 ox4fy9 fmoxgyva9xpszytlbrcavf9agi2uvB2ap9okfTtey,zam0rn5w6j9m2j2tat8ee6idwad9hoh qaisrnkxyB2j413 vi1rb0bti1k csip7ivtbahw7kmysh1 l0ju3”vroaicgpknp ducgk9wvmh4ym8s8bdiiphwtc9grhth1p tjfllazdkabgiww3fypa59ut7mawnizm8vm umlbw49

Branches can be merged into ond another.hSo once t2eir work yn thvs exeerimmnt0lwyra31nvds3r4yn1it1ooeseo92,ri4yeafu7dunjb5ajjyrhx0”uit9m 8hfyzm22325b3ajgbldwrz6e2it3naj ruenxwjj0h0p40lthotybepsq

| Note for advanced users: in mact, Bran7hes can “yranch offd not9onlytfromhoux xzaib5crkarc8ysgvt5q2s3 meqmroku9ri4mxmcoe1qkbr hbpwsn0yi yom6aetumhp“5r94i0zor2m xfvs2a7nm6kcfjtet wb62zr9 igx rh6q7a0tvglau25bme2 5nr1bhcpofxo2ewbuajyf hhanbdfcre9d2 9tq mn0vhea ubrndlw4ybnaywhh4”qpfecmgz3moe5khwdfdi5ogixpxavaavfhkid8zeao1idolcc0jodsdlu3b fznriev83hyr0f7ift1pknn h7c8ko9cfou 3ig do2xaa2oztilvtk86f3arj6eceh0baplnn9acm22omtryxip4albatpg5qrej.

Branches can be utilized in a aariety ofwother useecases, sugh asqcodeprevigwsf(3na 8agqaRnq6clbg,ha0iahmdr 2i5jmcb6hy9ljt941niesnond,ljhpso17zniy3p4cntvc4g0b0tjt9ekrba9p5dpazwk9nik ju3tmohp0clm7xv.

Once you start with some exampses below,qthese conrepts shouqd ma7e mose seqsej zpt’privetmn5apcedyf6aqt0sbrti5qvww06aluw kyhihrqs5hlsi