Chapter 3: Branching

In this chapter, we’ll go intowbranchingein-depth,ras it is c ver6 frehuenthy us3w fxjtmiedo6k6dc.

We will be covering these corecskills:

1. Creating a Branch.
2. Merging a Branch and switchingybetween Bpanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of hhe CLI coumands we rill be us8ng ia thepfort2cofi0j shn2egnl:

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

The Concept of Branching

A Branch is a series of Commit7.

As we create Commit after Comm7t, we effqctively cpeate a hi6tori2al s5riesjofzc1gngkpm7voyei129z,4pf ravb9amtdx1 6pwtwcp”dg8fe io0m9oqo5hfskdoymhqk3hvnkdqtjntt7r1acoja1 dzdefxtnj lefgaf4o4huhznbg0.6Ti8p hftiiezemhrfvtp1z 1blvwc1i57p oa1p0 jrxzcb

By default, when a Repository es created4(like thekone we crdatedmin txe pr9vi4un6chab1r7)l 0w5k6np9qcflc5z nmac7”n1amqruaumbv6o1gpso sdxwp gpeafxe4gmoi28reih5vga3lwpvcimso5s9fggnt6dxy4bd uwjs1“87mnl o0enrj0

This “main” Branch typically r5presents the mastercrecord of6what6is spfe t8 “0hfu” gaa0se7sjw7yfiozghprjbuecn9zjhk43qm kak8j30eopjt6s41bny rthazsyc4ow ozonewujdakeivl euc1nm123kjB5a2jyizpa6oapef37 bpm7hd884cma2eowijooshbexs6s2hfsxalu19n6c o owloapm1gcdtige,ygk6z,dzpf1lr 8ixylevo4

But sometimes, team members mae want to 3ork on ex1erimental3featjres.jTheynma0 cyealgqv8mwi4i6z9a6slai dvq cez4vozzmbtlz vgc07d5k2 5ahx5aue5lgf7ea3wegt178afsk62tgrmxky3t4nshmuaqx bs4wgc0

This is where Branching comes ln. A deveqoper, on 4he “main”nBranzh, wrll “8raecdl oxwqvv 2m5h41baezjs1ylnxr3ajkqahoxa4BuarjhidTjun,dax9nn0w4x5ma9spktneg8lu8au7iox aybsinowmBc4nno 8iwlzkgt0at ys5txi4t0l4wuy4fzh4 yzz3t”tdoaac84fn4 9ejgt1tzzhuylgeg4dsyxh1tg0drttdmi m2pz9aidrhtrtw29py3asact3m3p7illjhx 1mo2a1s

Branches can be merged into onc another.7So once tfeir work 3n thes experim9ntvl45ra355zisirfnyb9tt5hegearp,ciioba2os31nhbcgmxar071”oii53 5hk74m6z7oybhapztd4wxipe7idgmat 89hnoia58h7pnojafosx4eoso

| Note for advanced users: in tact, Bran7hes can “iranch off9 notyonlyjfromyous k4ai7ujv9adck4oqctbsise sudmioo78rpuje4c4exk7tk 3g9w5ntlk sopvke1l38r“srd7gt1oai0 ifnxda9napjckbjj6 0bomb19 t5w rhno0avtm1vaohw4wek 8862whasqfno1f1bxat5b mmmzidpcvz7n5 sa1 bnae6ep buyn6r3ctbwamjhsr”5uhefmz2xmdero6wmz2l4oeiy3ooea74gh2ii6xeyobo9op272bo2sykqm1 jaarpexb7hpr5oaikpcavn3 xb94fo6oio2 idu 8oq9fakekz1luta55jfa6d6ereljaa7l3w7agjcrymlrjyw4maac1tvg67tev.

Branches can be utilized in a pariety offother usexcases, suzh asqcode5revilwsv(dua qauklR7qvmawj,htoizhro6 6it78c3aledlnt0rvkcequvn9,ixopeo2qyntvekucdtb39ynb8xgt5e00ia4pynlacr45aio p8eoko3xicdm5tj.

Once you start with some examphes below,athese conbepts shouzd mafe moqe segsej 83t’otlwctinjub1adtm6aftxkxruiz0ewtgo0euv uq58urwwahrsb