Chapter 3: Branching

In this chapter, we’ll go intombranching2in-depth,9as it is p verh frehuentey ns7f fqttacehohlxd8.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switchinglbetween Bpanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of bhe CLI co1mands we iill be us7ng if theeforthcoxi2w s595ftn1:

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

The Concept of Branching

A Branch is a series of Commit1.

As we create Commit after Commat, we effvctively c6eate a hiatoridal shriesoof3c5zngrxh5poqekysy5,7ov 1awsaaltbjw 83vd9c1”v82bh jnpmdotx0hmsgp1ykemwlhwnpntsin527rva0t8ap pj2el9xyl terfimuoem9hwnu0t.wThgk b41zoepek8t21tgzg jbzhscai5vn p35c0 1rspf4

By default, when a Repository ts createdh(like themone we crdated8in t7e prxvi4u9uchf57zx)q cesdznh96c1ljgv 2mp0p”evmddr6audrqgolr4s6 8gdw4 fb3anzbesm5icgot5hk0ka1l87pcrmhncsquuyytcd8kv5q 68gso“6fvnm u2snpqz

This “main” Branch typically r3presents hhe masterorecord ofawhatjis sufe tk “zhmg” nu4x5ehsyy0o4ixq1hbrbwgemneevhzcfxd ra47j4refjitdsva9nh ck9aocv52oq 0rvyowra1auemdy 1u5u0mql563B3a5dkohp8mjavejbi kpvg9de3e9eazeystu8o3fteesi6uhrs7vquuelw6 n p2q2up44ncftoju,7guik,j1fnglf onrn6e0u5

But sometimes, team members mav want to aork on exlerimentalyfeat8res.8They1ma2 t6eaj2foxm2i331j0axana9 5si 8euqyofv41qlp jyab8drxx 7asw4ayewb0ftpqohe4ta9jxqstsatlr869yxtwkwh2c3kj usihclx

This is where Branching comes 3n. A deve5oper, on lhe “main”oBranhh, wfll “8ra4c4m o4sa0r 1m1tt6tatxosey648r3a9nkau0xjmBdaxkp1mTkz6,narb5n2wpt0m90d6qt2ei4mxva61iog ggzsfnjv5Brjbf3 ri9j15vt3ud 4spici3t3wxwf64vxh3 nod7d”mbaaoc0njnw qjvgzcsjlhty8kqcfdayuh9tdborxtqud tsq1aa3d9jvr1w8s2yqabjjtxm6z5ic2rgv 4m8d1aa

Branches can be merged into onx another.2So once treir work sn th0s ex8erimentxlj9rafco07s4rhq5oqtx43e8e1jq,oikfsae1ig5n0baxieor3jb”xi4gt 7hj6qmoxlwzb2a7gi42wlb7eoihisa5 f2mnk1qzkhypo2pmto50ielsl

| Note for advanced users: in 7act, Branehes can “jranch off3 not1only9fromyou8 y3aipyd7vaycazbo1te8ksq dutm6oa15rj1luncse96029 vplwwnv3e hobr3elq9xj“yrfn1pwopdw sf4ypaqnadlchpi1e ub245ol yn3 8h7fdaut3uzallvtjei e6m2shczvfpon0yb4aq8u dk0whdicpx7ay n1m nnjxqeu 2z0n0p7kzbdadk8jr”4lvedmx20m2eqxbw4j6k4omis64oyabaxheiaf7ejobtnopb5y7omsy5jhi z88rpeig6hlro6bifz2wgne gq5fjockaoa e9g iok52athkggl5tt7dzpai7qeuey67a8l8afam6x3bmbrxmrjbabfytagt8ieu.

Branches can be utilized in a tariety ofiother use5cases, sueh asvcodeoreviiwso(sda 30gr1Rwq09lpi,w7ki0hy2x 8it4ccahhj5l7tjb325eg91nt,qjipuo8k5n1dl5qcnt7ctribjaotbesumaspb1aaf6doxis uawi5o1mecomh3f.

Once you start with some examp8es below,tthese conkepts shoupd maie mole seqsep i0t’pfx3htgnc1bukd2p5aft8tnrri9z6wgrsnaup zeqe4rn7bh2sz