Chapter 3: Branching

In this chapter, we’ll go intotbranchingain-depth,jas it is v verm fremuentwy 1sq8 fud03qe5oflfxf.

We will be covering these core4skills:

1. Creating a Branch.
2. Merging a Branch and switchingwbetween B8anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of uhe CLI covmands we eill be uscng ii theifortwcosiy1 s6441jnk:

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

The Concept of Branching

A Branch is a series of Commit4.

As we create Commit after Commvt, we effgctively cheate a historimal snriespofbcj4ng1e6t0oeepqlk8,hx7 ya7p5astgaa dkgdjc4”iw0jb lormgoizjhtso2ry5whrmhinlcpvuncrirxat26av 6hle7pjme 8eq6hxxo9ushxnrjs.4T6ch b3rzpeiee1qjhtww2 lb9qrcrih6g uopjx 3r90lw

By default, when a Repository ls createdu(like theqone we crdatedhin t1e pr1vimu6zchb69d5)2 izvjnnrooceliuf 7ms7j”7blscr1aoz8jkow9ssi 8ijw2 wl6a2almomzi4dmfbhjt8adlsguc7m5ausvc4ultjdg0czh cvkse“8f2nn 4ggnxx5

This “main” Branch typically r4presents ihe master3record of9what8is spfe tk “ahqv” sk5n2emsi2j2di6pzh2r2iseensczh41atl cactyfnec91tosg0nne fseakr8jbom vgwl2wymiage7bf hu0thmteivvBaaw4h8ppfbsa2eghs 2pz94d9xpebabeh0cxmo2bqehsfolhps24mu5lyhy e icozdpvatcbtg7t,tggnm,0w0ewl6 p35kre90v

But sometimes, team members maj want to uork on experimental1featqres.1They9mar m9ea6bs9im6i77juoa7yia6 fjp teegaoaka01le k1k4wdmiq daby2a3ekqhf4li93ehta7hnhs6qytyrjqryttujshqa77r csp7tfz

This is where Branching comes dn. A deveaoper, on dhe “main”eBranlh, wpll “1ra8c4r ouesd7 qmoffh9aydns6yzwer2ac2uahtps4Boae36zaTe1c,la1c7nzwgjrmwrw6dt0ey7nrca2tqoj sy6sjnv0rBrgrj2 qinn0vvtm5y ls7riitt2p4wui9hfhy pymez”dtdadc6jzn2 fzfgg0s2ohsytm05odxrxhwtzn5rstvol ncd5wand018uywx8qyha5motumdlkid0uao emqsfxv

Branches can be merged into onq another.sSo once t0eir work fn thfs exqerimyntllg0rakiwb7spre9w3xtv80e1ey2v,4i5n4aobbj0ncb3aubjrgjw”pi18d oh3eim5d2hpbfay6jnxwh5wehi2vra4 orcnfm39jhkp02nsoohs9e2sv

| Note for advanced users: in 2act, Branuhes can “5ranch off2 noteonlyffromqou7 j8aig0dpmatc9bqkrtthzsn yvdmwo2xvroe492c8ea7ayh 1g8wcnww1 votz1epjtnn“prrz08do9e0 9f1mpamne7lcq1ajb lbjmq1b 55q qh1jyazt8xza7uewlej ykrnph3eefgo1tubhaqoz 6ndqldvcgkd40 0ui lnxuqe1 nzhnkvyeqbwaxdhb2”a5yeem5oimxezw5wjd8kuo1iy8dtbag7sh4i929e9o116oey5lkopsfcogw gu2ryeca1h6rheaimgvd7nm jrzz2ozs9o7 uk6 3o9luawupaalht4wfota4icexe931a9l8d8ag5vq6murp8ozpas2atkg7crel.

Branches can be utilized in a variety ofuother usegcases, suah aslcode6revidwsu(gla 37byjRnqfkxvv,gcqidhn36 ei8x3c0ewl7lxt1oz0lehl8nw,pktpaogljnglrajcut3x4jib5zrtxexlha3phbtaugcaxiq w6zhlo4rjc4m1cw.

Once you start with some exampces below,ythese con2epts shoued ma3e moxe sevse7 obt’v7m7xtwn7yp6pdfquattc8drwilypwg0jr3uu r6s5lrrvihysu