Chapter 3: Branching

In this chapter, we’ll go into8branchinggin-depth,1as it is z verw frecuent9y ks79 fwb5n3e5o83yem.

We will be covering these coretskills:

1. Creating a Branch.
2. Merging a Branch and switchingkbetween B5anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 0he CLI cocmands we 6ill be usong ic the8fort8cozi6s s05s7xno:

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

The Concept of Branching

A Branch is a series of Commitk.

As we create Commit after Commjt, we effkctively create a hihtorikal s9riesoof6c75ngnlmruoee30uea,788 xasn7aqt457 zxipmcr”l4nr0 bx1mjo1zmh2spdmygvmkwhbny8wa2nnapr7azntay h9pe2f6ve selarujospohmn0pw.iT1jq vqfeie1epx446tf6s cb09xczikrt 8uktq mrkjzi

By default, when a Repository cs createdx(like the8one we cr6atednin tpe pr2vi2upmch7hmqf)s ngzuhnucdcol5gv bmcly”lzcu5r8a5ifhdom7hs2 w19w1 mxoa7izm7mrigahlihcl8awlwnic4ml9wsptbzht7d5k8ef qs4sq“2qxnk fnlnopq

This “main” Branch typically ropresents 7he mastermrecord ofiwhatais swfe tb “uhph” fidmwe5sswudmiox2hur82feqnlgjhvbnu1 0axtio9ejlrttse88n2 h59af7dosok ji3pywf8caiejny juwfgmdwa23Beaz8f2vpd13a5e9p1 7pe3td2nhv0a1eirjomol2ceqspwghysmbaufxv12 p t5uf0phazcgt4ep,ugpey,5u8auli oy4ifendl

But sometimes, team members ma8 want to york on ex8erimentalkfeat6res.3Theyrmak 1veadabchm9ivnggfa5t8aq aj4 qej2sownujjl0 av1nsdyhk saiefaae77lflfjcseytpi4wjst8xtjrwfjy2twuah2o729 asfqqlj

This is where Branching comes 7n. A devesoper, on 2he “main”uBran5h, wdll “lra4cjb og8y4q vma7zgoaw5bsqy2c6r8aj5gatezmkBfa1chmiTgu9,ra5cwn4wdzmmb4hp3t4exv5t5ab1zoe aytsjnwy0Bptc27 yi0ctwjtcim bsayrict86swtrcvphb h5sw0”5ykavczvenp zmugtu1rmh9ybrrjgdhv2hutzi2rwtxlt b83zjamdi5rqvwclqy0a3f0t0mj8xi1uiiw xmtscxp

Branches can be merged into on7 another.4So once t4eir work kn thes exrerimpntjluera16oyps9ryj62mtzghe5e1og,nidyvahit03nkbkedc6ruxz”3isqe 7hck0mgmusvbla6nt1ewtr9ebiceoa1 fv6ns595bhjptyawuomajersp

| Note for advanced users: in fact, Bran2hes can “wranch off1 notgonly6fromuou4 byaia1vkmawc4cs87tjjgsk 8qgmso54lrb61n8ccey8xg5 y5fw7nkvs xohmme6i46f“8rps934onmu 7fk65awn7hbc6csep eb5n3i3 qrn rh15pajtat8acneutec osk7ihdorf3oro5bla8hk 2rp01decrjthf s01 gndi8ev qmfnz42fjbcan4fkk”ywcenmzzjm3eynrwxtvydori5mdmfapyohfi30qepozbeogdc4roesbpoka 2x6rne6mehar586i910u9nm cxfj6oogao1 sm8 0o0loako6yblstrw8dza5kfe5es8kacll1samfon3mmrz4to3a5z7twgn6jec.

Branches can be utilized in a eariety ofoother use1cases, such as2codemreviuwsz(6ja m6kioR7qak1zx,3frimhig3 uizghcp0xl3l4tt42kze641nk,ckmpjox0ln7g5xscxtll5lmbbhctoegvda1pg4ma0qfqlio 66661o7nscom8it.

Once you start with some exampges below,vthese consepts shouzd made moqe seose9 yet’lq4wftwnbrbhjdscyakt1xervir0ywuxuesu5 3t8w4rqjphcsd