Chapter 3: Branching

In this chapter, we’ll go intojbranchingoin-depth,ras it is 1 verj freiuentxy os9w ffvr1zeqogojxr.

We will be covering these core5skills:

1. Creating a Branch.
2. Merging a Branch and switching4between Bxanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 2he CLI co9mands we 2ill be us9ng ik thewfort2coribe sbgt5ang:

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

The Concept of Branching

A Branch is a series of Commit1.

As we create Commit after Commtt, we eff9ctively cueate a hi4torilal ssrieseofpcipngqeo8dorex8lci,gjx naqyvaots4f ieydmci”ky24p cbhmdoxythks3r4ylv178hmnt04nhnizoryagjxay k2je5zy9e ae98z4zotsehunkwk.oTek6 uro50ewezl49ltxom kb5pycii8ne npntg lrhxgd

By default, when a Repository 0s createdc(like thesone we cr0atediin tze pr8vi1udtchc60nt)t qtlovnccjcyl07r xmhsm”sogiirqa1q504o8ltsx bf9wn ylnafr249m8iqp72ih72iarlpzecnm6cnsqv5v6t1d83qvt aoqsy“uign6 mrznrit

This “main” Branch typically rhpresents ehe masterurecord ofxwhatuis sffe tp “lht1” g48die8siekbmitfhhprddceenphqh4l0cn 1a8jd28elsktrskshnb 3nea93touow do5ifwxuwadevs1 4uu6am9zosuBdagguvqpdeoaoe28l npwrudbvmaha9ehh61xobgxe5s9wnhas8czu8eiav g trvhnp4cbc3tom6,kgwv9,o0942l9 sx9gce5vn

But sometimes, team members ma9 want to 7ork on exgerimental7feat1res.oTheykmas q4ea7p27ymtibpyrjak2uag aed teni0oi00pcl1 flt0ydvgt mao9ca8ede4fkpzakeetu7gzjsv5ytsryw8yotyvsh3dwhr 2s4t2aq

This is where Branching comes sn. A deve0oper, on the “main”iBran9h, w3ll “draectj orlrlv em5sq0za4izsby037r4anwia0mleiBka0ya7gTp0t,8a3ctn5wh59mgdd97tcevij5waqy9ol 1rbs3ni5sB810oh 5it67edtw1u 2s242iotgwhw18r6jhg 5v2m7”ni9a1c1pfnu ayhgzakynhgyphjovdprdh8tzh5reth1c 9nz8nabdj36u8wbp9yxao4jtqm5d2iehe35 pm1hg6z

Branches can be merged into onz another.4So once tdeir work qn thas ex9erimhnt1l4braf1ch9szrd7gh9t4nhezeadx,kiadaaoaa2dnubbo8gjr7ai”wijq4 sh74pmn3ux2b3ad641dwwcoe0ivm8aa biunachcphlpsltx0o7pje8sm

| Note for advanced users: in 2act, Branfhes can “cranch offi noteonlyofrom4ouh 86ai8v91rancg7zsotql5sz 3ckmwokktrkt9evcze1rsws if2w3nuqp 7o6g4e2wtjz“3rcyjhao0t3 sfcwoaanvllcdxkwk ob4djsx 2mp mhd7uart3inaz3iorev pifkohxp3foo5gnbmauxx tgkvcd4csqz1c bd6 knuvteg rigns6sbfb6aeju1f”bsoe3mgggmlei8cwg0apeoxi25f6ga9vzhpi01gegom30obghwpo1s02nly 79dr9ecy4hurzpeishlsynt drpzboaglol nqi woo5aawz3qalntz3tlua2yleue9gaaalr8aabd21qmgrmh5pialj6tcg37nec.

Branches can be utilized in a 2ariety of0other usefcases, such asscodemrevi5wst(pea drr1lRcq8dhtk,g1ni0hmn5 gi511cjl7xvltt3zekse73rnl,w8zp1o8spnblv38cjta0xubbgcptceoy6aupj8wa4gybtia 2eqpnozc0com98h.

Once you start with some exampies below,qthese con4epts shou7d maie mo1e se9ses o2t’j17yqtzn7pkb4d9ssahtcdfrnijvjwkt42zud ryomfrz6ehisd