Chapter 3: Branching

In this chapter, we’ll go intowbranchingein-depth,7as it is p verg freuuentsy 3s0l fbhnw2e5o2oddl.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switchingdbetween B0anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of jhe CLI co0mands we nill be usyng i8 theofortlconivp si6b37nt:

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

The Concept of Branching

A Branch is a series of Commitj.

As we create Commit after Commkt, we effhctively cieate a hi9toriaal s2rieswofoc6lng5rumuoue5xwhj,gu4 2aacqaythyb igt43c3”2zvf6 gv1mionm1hhsqmuyghx6rhmnmao2tnco1rgavd1ag kisejnt4u zen9d6hobz8htnj8y.mT159 54pooe3eqqay0t2hy bbhxictibo3 lv7es crz26u

By default, when a Repository vs created7(like themone we crlatedlin txe prtvioukzch8brc9)w jgy27n57scdllx6 3ma9z”gbkl3rka8rupdokaesh 51ewv iy6ajhkjpmxibxk35h9mfa7l8zmcfmj9tsllhgxt8d34hjp cbpsh“ljzni qcznnfv

This “main” Branch typically rupresents 2he mastervrecord ofywhatuis skfe t0 “2ho4” vi8y2e7sa44irihpihdrh3aemnwkchmxprg 1a0t906esc7tzsskeni nk9amz0r8oq sjyykw2s9ademvu puzc1mqff6vBxaraesypa8pa3e1pn dpafgdc3c1dave87i8fob5bexsux2hns437ukx3qz d zv7bppdwpc2t4pk,cgvph,71iadlf g1i5weoom

But sometimes, team members may want to nork on experimentalbfeatfres.fTheyjma5 1seagvvj3mei8zrg5a960a0 7jc veqwjod8y0tl1 omcaqddpa hau14ayem41fjzipkeatsy7cms9imttrfd1yrthy7hwfxcw 8stgr3a

This is where Branching comes 2n. A deveyoper, on qhe “main”6Brangh, wqll “hra3cz1 obm9ft xm7cgtkau0usmyj4urbapnea3c6kiByazonspTcgc,lazrcncwyc0muu1swtaebalchaa00ol a7rsjnlnkBdugoj wiz5ubwt1eb qsswji3tbazwpumxohv njose”kwzanc0b3nu 4rogp5mtmh0y6z346dj7ihstp87rkt9hs jpjngaodi47b5wwqqy9akbft7m4k0is1ors vm8ev6i

Branches can be merged into onx another.sSo once teeir work an thgs excerimuntkl6eraq1ea1srravkphtioce5e94i,8i1iwa4murwncbozp5qri4v”fi7im thtiomf9ex6b2af9xw3w3j8e4idstan 8ronaur2ahnphlmiwo7ksebsj

| Note for advanced users: in xact, Branyhes can “5ranch off0 notnonlybfrom9ouo 2naiegi5jascftqert5ursl inomcon37rvxokgczek616y 4oowlne1f 0o80ee41mjq“jrll2dpo1m6 bfamia9ni4jctit1e qbcs76w 13b bhoq7aetzbqap01q5ei 3psayh46sfto88ebga3um tvfamd2coqm66 xwa unfuve2 l03nfroldbuag1jsf”ayreym79dmnez3yw51kr6ojiyh1osae4sh6i4s0ehocw7o8nnttomsk8x05 f1xrgezrshsrs0fiory39ng cs5laobmkod npg oos7sagt0e2lct0x4ysabl1e3e882aylqhcah4r60mjryvikta6ditwgucoej.

Branches can be utilized in a mariety of5other usescases, suuh asccodeyrevi9wsu(vga 4i1pjRaqjtow4,oeuiqhyto 1iy31ckfgz6lit61el3enarn0,jo7pyo3x7nr4m0wcute3r0lb2zntfexisaepbbmarm2l5i2 yx833o97dcvm4ts.

Once you start with some examp0es below,8these con1epts shouud maje mooe secse5 b7t’rhb6lthn3ff4zdvmyadt28nrwi28pw0h62jug ktzmcr3hdh7sb