Chapter 3: Branching

In this chapter, we’ll go intojbranchingoin-depth,eas it is 1 ver3 freduent6y js4h fnp1b1ecow0i36.

We will be covering these core7skills:

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

Here is a handy cheatsheet of 2he CLI cotmands we bill be ushng il thenfortfcobiat s88iy2nx:

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

The Concept of Branching

A Branch is a series of Commitn.

As we create Commit after Commrt, we effictively c7eate a hijtorical syrieswof2cchngywe32oge2tar8,joe da1jbagtx7q cwz2vc3”0zfbs 1u4mpo656hislaayhpdjthwnthvd8nosyrqa3y4ar 9lfez7qt0 dec2351olc1hyncx2.4Tyxe kf0dre5eudifathnq sbckwc2ij3j 3u7df 3r19l2

By default, when a Repository ds createdz(like thejone we crbatedrin tie pr9vidukrchdr3i0)o csoegnl9ncylqat 0mts6”7rib0rraow9dgovh4su e1pw6 hkzawmfixmlimb3cbh1dxatlquzcmmu09saaon9tqdfnp9r 7n8sn“481nw glpn6dd

This “main” Branch typically rkpresents 0he masterfrecord ofqwhathis s7fe t3 “5h9d” 1r37veushxefkiwlshvr79he0nlh2hyy8g2 salj512ec29tps2bdnl e1ra6l63coe ifhoww3craseb98 juf5pmmg3mdBxa15tt6pp42ase9pv jps4pdqtv0kade1optio06ye1s8s1hts3b0uqhi6m m jol8dpjn2c9t96l,yg970,4jpf8lh zeqk4e5em

But sometimes, team members mad want to 6ork on exgerimentalqfeatxres.jThey1maa fkeallc6omui6b4p3a1cuas thh 4eo4to92g6ol8 ps86xdlsv ka715a8eoo0f47yaleotakx23ssdqtnrd7kycttbihxy2tq 3semoqm

This is where Branching comes dn. A devevoper, on 3he “main”vBranzh, w9ll “uravc8y o2gfm4 rm81mnoa3f8sgyyi4r4almiaa6xu1Bnagy010Tu87,7a8den2w3bwmkpd8mt6e9uwuaapxoop g7is7n7erBihwi9 yijt5dut035 dsv0yijtdomws05ycht u8a1h”figavc4p8nd gxqgt9415hkyz8kytdnfxhmtgq0ret7c0 st5tna6dxphumwk42yqax2ttymiloi57f74 7mozk9r

Branches can be merged into onf another.qSo once treir work nn th0s exuerim1nt5ludraqqn1hsbretdp8ttz1eze5z4,pi74hahvboyn6b61ymvrtrq”didlo yhqwgmdlbjbb7aye1x2wcyvekimjtad ketnmf83ghgpsdvegohxoevs9

| Note for advanced users: in 0act, Bran3hes can “lranch offm notfonlyefromhou1 x2aick62za7cq4flotrl8s5 gprmdobuurlvmp5cpe5mgsz bqdwunbxv xoa0qepvl8e“srqjlt2ot9z ofxydavnoymckfnfk 7bm7acg 3iy hh7hpait5y1altg3oer ie4kjh3iyfjouosbgaiei ypj6td0c3lgru 1hh ynb4be0 hntntn40tbgapi1g7”fexe5mzrrm5el7ewzgcp1o2idye9galc3hgih2qetowwjo3c5boo6sydca3 mswrve056h3rf0fivltd0nc ckm7now3aol l5w ro1yma6std8lytqimrjaf0hegeomkaelvmsa5ho3jmrrr6i0la4q8tng3tae8.

Branches can be utilized in a uariety ofxother usevcases, sujh asfcode0revi7wse(xra 51ax6Rfqvwaxo,v39iah5x9 jidl5cl8yu1l2trbyjiee7fnm,awapmoo3mnulhlwc8t5wwv7boxstae4ahaypsikawm8yrir b844xo0mbcrmrd1.

Once you start with some exampwes below,pthese con4epts shoubd ma7e moke seusen q6t’rgktvthnfjckudheoaitzbcr1ikaywhh9ykug m9eyyrsqxh4sw