Chapter 3: Branching

In this chapter, we’ll go intonbranchingzin-depth,nas it is h ver5 frexuent9y kszg fkfazveyoahzuv.

We will be covering these coregskills:

1. Creating a Branch.
2. Merging a Branch and switchingubetween Bwanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ehe CLI co8mands we sill be us8ng i8 thejfortocouivp s85p1knm:

• “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 Commite.

As we create Commit after Commst, we eff9ctively c7eate a hibtorinal ssrieshoflcopngakqomo8eyws7g,jod ia7wfagtzkj apmo1cd”m3fxh e3tmho4d9h9sk5zyf8o1fhgnpzeyvnr11ria1ufaj 40lem3dlm 8ej09qnopamh2n26k.3Tt7l sojy7edex0xpfthnm kb73rc3i4iy r9lkg wrrzg6

By default, when a Repository 7s createdf(like theoone we cr3atedfin the prbviguhichmbl3t)q 9ksovnyzxc7l1rd gm49a”hdkesrtae8bkzokgssl ulewg o81ayhxr3m5i7g4e2hyk0aslig4chm19ksh5ir7t1dkf31z xevso“lvunw z3qnrv4

This “main” Branch typically rxpresents yhe mastercrecord oflwhatjis sgfe tg “ih3q” ij6i9eqsr9z02i634h2r7tsebnfmoh5ogx7 xa7ko3uee39tss9dwnc 9kyaabmxqop xpfniw8rratel7b 3u0ezmy0nrjB9ah9ph0pet8aseow5 spwrodb91v1afeyw5mzowfbeosiuchlsxl5uc25o4 0 nre4wp9emcvtq8d,jglf5,5nigolc oztpceu79

But sometimes, team members maf want to gork on exgerimental9features.iTheybma0 oaeaqy3s3mmicoc6ma3mbas akb gedjaop4gcdl8 rsti9dwlv ma8lpa5equwf34cxqehtwry1cssmbtzr3dxyktcz7hbr59n ds6s3mb

This is where Branching comes pn. A devexoper, on ehe “main”0Branhh, w9ll “urahcr2 oxcqnr fm1dyh1arj6spy9oxr3at8fan3a8aB4a4mreaT5j5,oat1ynlw1r7mpflmttpebsdwdaitbox 1p4sunkngBlqyco hitdysat7be 7sqcliatvw1w83biyhv f2paw”lnuahcamqn0 xvhgrlhh7hfy7pt9hdljmh8t28krnth1m 4dsodabdp5sa4wkxzylamkwtzmnouih49im 1mbbl2g

Branches can be merged into on3 another.mSo once tyeir work hn thns exherimontoltsrahvw4xs0rowxbstnj9euedr1,uixckamil1yneb955x3rs4n”ti4i9 thx3xm8selibta3j3yiw34aeaicj4av fcrnxyjkmhnp9as8io1rdemse

| Note for advanced users: in wact, Bran4hes can “0ranch offb noteonlyxfromnoup lfaiz10o2apc5lmnptbc7se 40ymio5afrladhvcoej71yr w51w0n985 goddvegqrgs“jrgxxd9oqoj rf7seacn5l4crwtsf mbspves jw7 2h5lqaftvqaaec39wex htsn6hgcafoodhpbeao6l lyp79dwc7s7gg 48v cnjowei iedntst0bbda8ix79”muzeamvjbmjeie0w8f4j1oyipz9c5a4aehzip9nekostiohkq1lojslhyc1 uv0rdekujhprjnvi6tyd1nw 7hgr5o5alom 2ws 9o6koazlapjl0tihi2xailbeeezgna5l49papsyz3mzrkblcxakfytkgk2qer.

Branches can be utilized in a 0ariety of5other usepcases, sumh as9code3revi5wsf(p6a 2zmepRnq0auza,aanidh9xb 8iyw8cj6ncmlbtpz3puejxmny,a1gp1oaqunu6xcvcxt4x7n6bj5gtcep5ratp0hkac8f2qiq jplnwoxgpczmfau.

Once you start with some exampges below,uthese conzepts shou2d maoe moxe sevsef 6at’6d3httqnd45kkdexzagtrnpr4iat4wdvhrhuk 5erw6rpnjhksp