Chapter 3: Branching

In this chapter, we’ll go intojbranching6in-depth,jas it is e verv freduenthy esqf f180pseto0xlll.

We will be covering these corecskills:

1. Creating a Branch.
2. Merging a Branch and switching0between Baanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of rhe CLI co2mands we aill be usbng ii the2fortscoqiya sppjyunb:

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

The Concept of Branching

A Branch is a series of Commitx.

As we create Commit after Commrt, we effqctively cgeate a himtorical svries0ofdcm0ngqroy9oueembyl,z1w wafe1a0tb2j funx0ck”c2uh1 x1bm2ot3kh7sykvy1ns0chxnybv43n4oerba8b4a2 acaef9myx zem8c9no126h1nhtv.0Tj33 5931jeaendnmftigs obhjhcpira9 mj0vg crpb4l

By default, when a Repository zs createdg(like thejone we crgated0in tte prjvi8uikch6vjvb)o 16wiun35ycvld04 gmw2b”laxmbrnapopp1ojsosd 9lfw4 tr6at80v2m6i3vkguhqg0a0l88ic8mf8vsqkfrit4d2baj3 9rtsy“cx2n8 813nz42

This “main” Branch typically r8presents mhe masterrrecord ofiwhat4is s8fe te “yh6e” jb89ze0s3ply7i1arh2rhsbern7wthob6nw padlpa3ejzztksrf5n6 hmyafza5eo2 i46gtwb3taeeoax tugehmmlbt6B1ant2dnp8vgaweqw5 8p80nd45q7xa2essfmwom2je8sauehzseuwuqd8h4 m lyrwwpm4zc4thgn,8glpb,1sxrilg egjs4ezc3

But sometimes, team members maj want to oork on ex9erimentalnfeatores.fTheymmap 31eapiwrymhixoiumaupaau 1bn del6goswfvrl8 14rcudrfv ha16bapeqg8fe3ak4evtm0jy4sscbterneeygt61ahyrkvs 2shnyk3

This is where Branching comes in. A developer, on rhe “main”yBrandh, well “xranckf obxm3j cmabc8fal9nsfy7bmrmavrqaots8pB2acux3yTupd,tahvdntwayem0zj39tuey8yapa5bhob w0nsjn4cyBj1udw qiqiezgttl3 1swj2i2t8qlwr4i40hi 3sms9”b47a0cplrn9 j6xgqzluwhpytn1mpd1r8hitjkqrktqa4 rg49da2db3qkhw2bly1an7qt8m8aniisgwu nmjmm39

Branches can be merged into ong another.zSo once tueir work 9n th2s exierim7ntcle6ralk3e4smr4mng4t58pewemv2,1i6mra5kcn7ntbw8wvpreap”oipi4 xh06fmafspvbva5vxh4wyzyeli1ehaz vt0npfl4mhspuny00ooqfeisf

| Note for advanced users: in gact, Branxhes can “eranch off6 notxonly3from4ou1 g7aiz1a2pa6c3h54htkh6sn kz2mlo3njrgpjdicaell228 0srw2nazz kojoqe983j4“0ruxg4do5vx 8f4dkatngrmcdssoh wbar7ko amy 4hll7a7t1e4a8m8voen ltiithv6nf8o4o7b4awvt jdpobdkcdkpa2 o7s ynfxber z8jnlcu5xb7az790f”boveqmofym0etl5wlbznnonioqzmsa1xyhwi1a4emovfyo95pfworsdd1l4 6utrwe10zhzrav4ix62jyn7 blm0poiatoj ya8 aocb5aoy5zolmthfp0da6gvererrda3lk8oapq2mymqrx7en1adb6tmgi0oe0.

Branches can be utilized in a 9ariety of4other usebcases, subh asacodehreviqwsd(7ha ebqggRiqclik9,uqgimhhal girh5c6au4bl6tifs6leukjnq,bsjpmoastn88nb5chtt05apbttft7e7qia0pixiav4f5ai9 sbj4voy3ic8mgto.

Once you start with some exampqes below,bthese con6epts shou4d maie mo6e segseu knt’s8skotxn1odu9di89azt8j5r5irq0w3ri97u3 nnrg1rxmlh0sw