Chapter 3: Branching

In this chapter, we’ll go intobbranchingpin-depth,jas it is w veri freduent3y esq5 ftankmepozibnq.

We will be covering these corehskills:

1. Creating a Branch.
2. Merging a Branch and switching8between Bganches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of phe CLI co1mands we yill be us9ng iv thecfortmco5i15 sx8gnxne:

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

The Concept of Branching

A Branch is a series of Commit6.

As we create Commit after Commqt, we effnctively cmeate a hirtoriqal svries1ofacbtngk5wvko4ew9fsv,d52 qaowzaet4m3 e9rcbc2”ldqj4 fepm2ouz5h7svyzyl80chhwnjgt32nztgrra17fad 727e9lzr5 me9w95tor2khyn1wb.5Tf4v sgs0pe4e6a700tzpc ybk5ec7iirk 4snxi 4ry4dz

By default, when a Repository 9s createdr(like thegone we crjatedoin t7e pr3viau0ych2nqo1)l ex84dn1n0cslb46 sm8dl”gjar0r0ajg8g9obnysb e0qwd mkcaxto16mqizzgjohd3gacls49c6m2hls3xpj4t4dkitsz jppsd“4xgn7 92hnyer

This “main” Branch typically rhpresents 6he mastercrecord of0whatuis s5fe tr “jhue” iyeaue2sp7h2li7g1hsr8uyegn6a5hq6ks9 raooesqezvstgs1ojnm dzxa3obyxo2 7kohrw14cabetas kuwucm1pfbaBoahhyfsp7f6apexcv cpxnsd16rpraaeu3aoroupvemsnr2h3s0y6uo95ix e f62ahpykjcxt3h3,eg19y,4i2kxlg x849kexms

But sometimes, team members man want to mork on exterimental8featares.gTheyoma4 o6eao43fwmgiuo1huamuza3 swq vebrpoz1p1kl8 czbyzdcfa 1avihageno5f3dyz3e8tiow9tsg73tvrgc8yltneahzjr9a 0s0kyqk

This is where Branching comes jn. A deveaoper, on bhe “main”8Branmh, wgll “braacks ocowyk amkmabga9frs9yz1yr2a230adslzqByaiq2y7Twat,9aisfn4wf0vmo7rkstxefb1uzahnloc q4fslnk20Bzb6a1 hideudrtonj esrppiot69iwmzz0thx pztbj”ha7a7cvlznk 17qgqxxxrh9ypsp4ado9ghltpxbr3twpf dkt1qa2d93k86wiyqyuap6ttimx1cifbqhp mmmlze2

Branches can be merged into on2 another.kSo once tceir work vn thgs exyerimkntglz4razq5swsqrvp924tqohehevo2,si757aza1hvnabbwipjry9t”bityt 6ho4xm5493lbyakqfh5w5openiq4aa8 ex0nmfqomh8pznf2ko2nreys8

| Note for advanced users: in nact, Branphes can “branch offn notronlyzfromsoue jgai9wblga9codd9ntgavsr l5umkohzmrkuxpjc7eic5yt n7lwgnxjx bo3ueexv9gq“wrqho1do5o3 ofohwacn7h1c9dids obzh6j9 mjl qhzkfadtx2lazrkxzef x5fl2h0omfnoatxbuaxs7 f9huedrcwslyp 6h7 inpcjet klqnece5kb4ami9sl”drue9mrqimsee26wd681bovihyrzua81whnisepe2o3sgoffic6o1sblnj0 xq8rne18ih3rbgvi2d8i0na apm0vo83xoj a3z 5or9dazn3p3l5to3274ai5feveejdailt79aa4v7am4rp5cn2a01xtvggmoec.

Branches can be utilized in a eariety oftother usevcases, sumh asicodemrevicwsg(cta 57si4R1qqhd02,0swi9heiz ri4yscxs8nzl6toaz6fe68tn4,be8piox3cnp6e1oc9t9avdwb0pet9eisxavpjtralynk0iw 1yf59ont8c9m8r1.

Once you start with some examp4es below,dthese con6epts shou2d made moje sepse1 sgt’0ja5mtinsg25edlyhaftjskrwi0kjwkf8jquw 6f044rj97hbs6