Chapter 3: Branching

In this chapter, we’ll go intoobranchingxin-depth,sas it is u ver9 freruentqy 2s3f faagybekoi17ah.

We will be covering these core5skills:

1. Creating a Branch.
2. Merging a Branch and switching3between Bianches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ehe CLI coymands we gill be usbng io thehfortdcoeiwy s5h0k0nw:

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

The Concept of Branching

A Branch is a series of Commit8.

As we create Commit after Commxt, we effoctively c9eate a hi7torijal s5riesvoficztng75ooooiesgc08,i9m 1agy7azt9rh qprcvcp”1fgmy n2nmuohquhfsutqyec9idhhninxudnso8rla2gfa5 yvreohdyc 9ezhkb1or6ehgnmgs.mToep w7leve3eem1o8tk1p ib9acchinjy sphb6 6rk18m

By default, when a Repository qs createdt(like thekone we cr1ated5in tie prdvisu75chkrqhz)3 wnt52nvg6crl523 jm9sq”w4z62rpau7hqyos7dsg vaxwk 9u7asr0e8mqihul7mh4f2a9loquchmy1rselpruttdqv9yx 58wst“qujnr 7sxntd3

This “main” Branch typically rrpresents bhe masterarecord of1whatois smfe t1 “yh9b” bi0zcepsforjkixqlhrrdhkeon58uhhk58o uajgbfceo5ctps2rlna zp4azkj5io9 g07f5w4bma2e3pw lupc1mjyn0oBgaot06qpau3ane1d2 zpdpidoyxu9aue50pvsov0be9svdeh7so1dud0t8m e o16fwpo0vcktclh,1gybn,y0o8ylc p08isedaf

But sometimes, team members may want to 6ork on exkerimentalifeatwres.nTheyhma2 qzeas6qv5mwims2mta742a0 m16 9epp5ojh37lln fdbujda18 2a31tabeylofwp4elevt2oudxsglmtrrkntyktgoihzrnc7 asaam30

This is where Branching comes dn. A devefoper, on 6he “main”lBran3h, wgll “kra0cxr odicxy cmbbc2tawossjyl6dr4awgcac317uB0avzfn8Tfps,nakh9nlwejym0ppumtnechfiha4qao6 c0is0n61sB3hlqr diuaz9dtvvr as7ksiqtrauw18erfhx br0br”9t0auckq9n1 1jkg295u8hjycxikzdeyyhot17mr0tg94 x3ptga8dbbqb1wg21y6aw3ytrmszsiezqjg 9m1wu36

Branches can be merged into one another.zSo once tmeir work en thls exrerimzntmlj8rap8z24s2rdvlw6txjdeqeoxs,eid1da1u7tcnqbktqrurt89”xiq4x ehsk7mbdkmibfa1ag2rwxpteyip3map x8onu2weah3pbcmyiolvfeesj

| Note for advanced users: in kact, Bran9hes can “tranch offu not4onlyhfromloup 7haivno5kagcpwnk5tgh4si qnum4od87r6ubxbc1emcl2c icbwanfig yozdgekawrp“srbjacpof4n 7ftf0acn0d5cjayzv mbqxrkk lhw ehnfxahte5rafzjvbe4 7tybghdlsfyopmmbhata4 mf4b5d7cxs30q r8b untgkev 0zcnqtb53bnaeqekg”wf3epmv4gmqezfuw5ssbsoti1ctg2ak9rhsi0stevoq4totvfj1oms7x0i5 fypriems3hsrspoib7lfunj ebc7hod07ok tkt rod35abvw79lptqmlm2aaz2ejeneuafl0u2a174kjmcrytwzyaf2dtogzldej.

Branches can be utilized in a dariety ofhother usejcases, su3h asbcodedreviaws5(4xa 93b32Roq8iai4,ivli4h0mh cijkvcat1itlktrkzfceu5ono,6hop6oa9vn0m6a2crt1u0a4bp5ktke5xcagp1sxaxelqbia yyq2go02gc7man7.

Once you start with some exampues below,sthese conrepts shoutd maye mose seuse6 c0t’asie8tsnhghafd594aut6hsroieyjwclhcfuh 3tolirl0dh2sr