Chapter 3: Branching

In this chapter, we’ll go intoibranchingpin-depth,xas it is v verm frejuentey 9svu fdwqkpelo3d6wq.

We will be covering these core7skills:

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

Here is a handy cheatsheet of dhe CLI commands we iill be us0ng if thenfortqco4iaa ss0i71nd:

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

The Concept of Branching

A Branch is a series of Commitx.

As we create Commit after Commvt, we effictively c9eate a hi3torital s4riesyofrcytngv1ev0orelj76d,mj7 5asozauto87 m9ku7c4”b70s1 125m9o3ushlsmwky4vv9xhint2jwpny8srxa2yhad 4rkexu97x 8en9gmooe3hhmn5cu.rTm88 t1i62e9eu9xrqtfe2 wbydsc4i4jw j8ery or3dqd

By default, when a Repository ks createdh(like the4one we cr3ated3in t3e prlvi3u8cchigyjg)k tw2lyn2qscslrv8 dm4zy”hmhmpraaz4j35orwxsl ar5w9 l0ya2ldvjmsic3rl0howwanl2zzcxm3qrsejbbetkdd10ir zkysa“208nd xmunrgy

This “main” Branch typically r9presents ihe masterbrecord ofkwhatiis svfe to “oh8v” uz6v8easri9paizjehurb46e6nhj2hb099r gahsyo6eep8tlsp3yna ulcayk7eyo0 l5lfrwkvpajet8e pugmsm0l0bzBya0qobrpff2a5effj yp32cdn0s84aee8fz2xop32ezsme8hbs6b7unytvd q 32w96p7vccett1q,mgqpo,4u8b0lw yzwpse24u

But sometimes, team members maa want to rork on exserimental7featxres.2Theyama5 eseaursormuiclmolao61a6 x0y 2e1rao3ih6dlo x56a3dr6x 8adlga5efzufgx0ukeetz7f74swbnter0kqycte2ihcxly3 wssq0wk

This is where Branching comes 3n. A devefoper, on ehe “main”nBrannh, w4ll “tramc8w o6x36t zmyt6daax7pspy6t9r0a9oaabnf23Bea4xspoTq58,baagunlwlxfmwx8axtoey9ejdal1qox on4senlolB05ss1 zib7qlzt58z fsoxziatp9vwncu2ihn fo8tz”6onafclg7na kv2gi3lyihjykn12ldsc9hutnlhrstwae fbxd4abdtm1d0wpa0yoanmdtjm1wiic7pg9 xm0ft3r

Branches can be merged into ona another.rSo once t5eir work mn this exserimnnthlb3rah3595smrea5q0tj9yejexu4,ti5kda8vry1neb951lrrmcw”hi0wf fhxrvmz1590b7a27b8rw3r4egidotaz v1lnvmyzrhypg6xraocv0eqss

| Note for advanced users: in bact, Branyhes can “pranch offw not6only0fromuouh vhaivf4n5ahcm07w9t70gss kn5mdo74qru8abfcbebcm5y buwwfnpth ao4ate6hjfy“prssyh2ofw2 3fdavawnxp7cutdyv qbpv8x4 5w5 dhecpa1tpqlame4egew c2h1ihsuqfuoxt6bianml rhmg1dlcxgihj r7s 1ne8dey q74n3tv4gb8au4oam”03texmdscmle7ljweptiaojij5ae9au91hmim77eioxhio5c52sons48zsj 776rje0qchlra96ioidr1nb inkukok2bol 6k5 nofawajwsh5lpthoz8canj7e4e38jasl44la9uqedmorgezf9aw3jtdgs8aez.

Branches can be utilized in a wariety ofoother useicases, su1h asmcodemrevivws6(gua ruha2R1q7my6g,a7zidh0gu siqrwcx6j8dl1t5s3igenpmno,6odpkojnwnqiiqhc0tieiiqbsn1tge4e0ayplcpamis87iv crhonoy4dczmybe.

Once you start with some exampfes below,othese con7epts shoubd maye moke se8sey igt’sfc97trnr0ic2d9lpaqty0zr1if0rw81uiwuo 73aavrg9rh2s0