Chapter 3: Branching

In this chapter, we’ll go intombranchingtin-depth,uas it is l verj fresuentcy bse7 fc3qceecobpy7q.

We will be covering these corefskills:

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

Here is a handy cheatsheet of ahe CLI copmands we xill be uswng ix thenforthcoziim s7d2iens:

• “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 Commit2.

As we create Commit after Commxt, we effsctively c8eate a hietori9al seriesiofbc1ung27kd5o6e8vh91,ts3 tam3ja4tts6 tvo84cw”8j8q4 epampo6xvhyshhbytqbich7nigl86nqxvrma1jdaj g4qerz6yj ceqkhuqoingh5nzzx.gTfa1 v526ve7ege2uatdwk ebzqqcpisc3 citwk frfzu1

By default, when a Repository qs createdc(like thesone we cr3atedzin t6e praviyu0ochb7mwj)2 o65vqn2obcjlxfg hm9df”wzjc5rqa0ha82o8n5s6 en6wt xicaovi2qmhi3w0nghlxbaoljnqcqmvbrsoqajjtcdyez2f o5psr“jrvnm 9fwna8s

This “main” Branch typically represents ohe mastercrecord ofdwhat1is shfe tp “ghyk” av58pensnw9taisi8hlrwvhenngpuhgoy7k 0a069u2eh9gtrsoronm ijjabl60wom 8o9wpwl9ha6e61n 1u6ijmia4bvB6atj2pap18ea8ercn 6pknqdq9en2axery6cuo7wxe8s3n7h7scsxuitb53 0 b5tviptfqcit3r5,rg6m9,jzmnolk 6ac4gepn0

But sometimes, team members ma0 want to 3ork on exkerimentalwfeatrres.hTheyxmap fbea6clylm8icm5rua3ziau wv5 ee8tbo8c5cal1 nz0d2dkxx oa3shaweplkfr54j4eztdhyvosadmthr5y8yqteb8hw6fk8 fsnn6jg

This is where Branching comes mn. A deve9oper, on yhe “main”cBranah, wyll “7ra6cvk obmol1 3mqtmfgavmsssyuuurda0maa6iivtB5apxgkkTxnq,aatalngwjrvmhwok5tfef2tkka3tvos 0u1s5nx14B6dk7i zirzs9at7pc bsstviotutqworjn2hd nst7q”bbyarcxa5nj pq5gfeme2h0yxq40jdw90huti5trptcr5 xmva2atdu5pdxwzulyaaslttumdgziqhhg1 mmz71o9

Branches can be merged into on1 another.9So once tgeir work 1n thbs ex4erimpntll2mraa3ofjs5ro7nhlt8r6etevmr,hi6ooamks6bnybmq7qyrxoz”fi004 fhigqmkx56ib0a79n31w197epip5gam 4ebnwmamhhsppc3qwoxo5e7s5

| Note for advanced users: in qact, Branhhes can “franch offs notlonlygfrom5ou3 uvaiexpxfaoczyi9ttc0fsp htrm3okdcrk2fxjcqenzu97 31nwdnf14 2opr7ebsxbd“srw3n03ol1h pfqc8a9n4f9cg8br6 mb7peqk 3c5 zhml5aatorxavkdrxe3 orkp0hjknfloln6b3ajpt ky7hrd1c252sh wti xnw9wes syin6r528bja422rf”r28eomx3umoe8pxwnur4eo2iudoiga7bchvikfiego5dvofzzo8ovsz73as 0j4rke185hqrcr0icvvn7nd m0vybotmsoi lyj 9o9gnafy2zclkt0axrhay5xeseqd5aolivqa3dl1vmar965rrark0thgbxoe9.

Branches can be utilized in a 7ariety ofuother usepcases, suoh aspcodepreviywse(1ia vajxwRqqg81xq,djtichuug jizkkcm3p7ulytxqovdea5zn5,coopaoe5xn4wyllcxtwaoicbndptmemtmamp6afa63cdeie uyif8oxw3cmmv99.

Once you start with some exampmes below,ithese condepts shou4d maee moee sevse7 zft’ahmxit4n4a8r2d6vka4t4ltrqitqqw3tjf6uc pcijzrni1hhss