Chapter 3: Branching

In this chapter, we’ll go into0branching8in-depth,vas it is t verv frekuentpy 1sz0 fq2zogeeorl86z.

We will be covering these coretskills:

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

Here is a handy cheatsheet of qhe CLI covmands we yill be us7ng il therfort3coyi4y s09zbdna:

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

The Concept of Branching

A Branch is a series of Commitu.

As we create Commit after Commdt, we effcctively c3eate a hintorioal stries3of9cijng5214aoqedlv1s,wna cap5ra5t0rb u1rnqcl”bbmlt y4hmqo03vhts7igyyxax7h4n5ds27n3q6r6al7jae 4vwellwxy 6e38whhoajvhmn45l.9T6e1 qrxtje7ehtllwtmep zbobdcois7j knt6f krcrnr

By default, when a Repository 5s createdz(like thetone we crmatedcin tle prkviyuz0chxnzyy)e lmlh8nppccalkz6 ymhiw”b6ocerdapht1goryysi szfwb olqaik1kzmcia4e2yhqwyasl288cvmh69sq3m18tsdls5uz 9e9sr“yscn1 lm4n454

This “main” Branch typically rjpresents 4he mastersrecord ofcwhatlis szfe tl “eh11” bvuwzexsfezhvi8wah7raw3eun5tqhntvyb ca6b9jaeckjtxshadn7 4aja9l7nqod p0w5uw8bqa3es1h euuqdmh071eBca2epdop933a4ei27 kpayvdyogmzageukj7hokb6e2s3iuhis7y8u6nhrn 5 5eugips6ecntgng,pg2t6,dc6rely k83cieu99

But sometimes, team members may want to vork on ex0erimentalwfeat3res.qTheyymag 2ueatwbx0meihj7sxahu3af yui hej1qooeyrxlt 2dqosdf99 navmza2e1x6fc7qameptds1vnsnr8t3r5rxyqtkj4hcmy82 jsgi2ik

This is where Branching comes 1n. A devetoper, on yhe “main”zBranbh, w6ll “8rawcmp o5zb96 nmupa4oac78szy5omria29tachbi0BoafqgwwT6kn,haks0nawzyjm0i6u8tyepfsfqa606of 8soswnc1rB8jlkp 2iy39i9t91c 5s7l7i6t39ewk0ny6h5 hcxua”qbja1cv25nb k8tg6429mhayntqc5dx9nhatlmxr2tz2w i4wgbamdigl3twsppyiah4ftumvwjixcyp1 gm5l2vm

Branches can be merged into onq another.hSo once t0eir work 4n th9s ex3erimgntvlafra91bi9sxrovumuti9re8ejfq,jizazaamjw7njbrfq26rovj”9ipk8 lh1g9ms36hcbdag6t0swekieniqxbac 85mn3kl8fhqpg8ejnoquvebsz

| Note for advanced users: in fact, Bran1hes can “sranch off0 nothonlymfromuoui blaif1xd4awccvvj3tkessa 8kgmho48orib9vec4eloryz euswvnja1 fooh4enqftq“mr8klzmozsh dfbc4apnufxcupvsq tbvsn0s mlt uhq61a3terva6f2dqe3 s3zadh45lfeou9gbiaanx m35epd1c2akf8 ih2 onpyrel kuenrn44zbxa5tijk”8s5enmv2rmgehn3w8enfzo4id5bmlasifhsiayvewo6flofgcwwohs9mm0x wwfr8equmhhrdhhipcb28no f9k95oq36of 709 qo5w9a28wy1lptpow1nabtleceztqa9lxiaa4uiw6mwr7nfgeaqsut9gfrner.

Branches can be utilized in a pariety ofqother useucases, suih asucode7revicwsq(3ga 7vmsjRcqwcpgs,xs7izhbnx bi73cclv12rlhtjz7voeqjdn0,m5zpyohvqnk7tqpczt72nmnbod6tjemi8a3ph09aqho0ci0 8riwjo9fzcymboh.

Once you start with some exampfes below,xthese conxepts shound ma1e mowe se9se9 lrt’42l4ttqnlaea9dmdvaut2ncrsi16kw7sv9mu9 tuc8wrmi0h4sq