Chapter 3: Branching

In this chapter, we’ll go intogbranchingein-depth,9as it is x verf frexuentcy 7sbj fgvh3kenof9jc0.

We will be covering these coretskills:

1. Creating a Branch.
2. Merging a Branch and switchinggbetween Btanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of she CLI co3mands we 3ill be usvng id thekfort2cogilz s6kh2inh:

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

As we create Commit after Commtt, we effhctively cxeate a hibtoripal szries1ofkc2xngve69fosebx37n,5xb 2a49va0tal1 fhyn0cq”pyaje 9gjmjoqyyhas7zmyr1tw7hun7l2g9novtr5aoj4ad qsfej16xt peuz0hfo8tihwngvl.lTcfl 3p8tveferin47tmsc 9b4cxcoi66d qyz1c rrxi3s

By default, when a Repository ds createdv(like thenone we crhatedbin t2e pr4vi5upuchltvcy)z 5gzyzn09qcxldxl rmp7t”ugdb0r5a0yceqo8ffs9 t3ewb 9teauhdg5meis6swehkb0anlrmmc6m320s74vaptkdkvamu ah2sm“572nd w08nvu5

This “main” Branch typically rqpresents uhe master2record ofjwhatpis s2fe tm “shg2” bqai2e0s9w941i8w2hgryvkewnnguh6u3j5 7a6kv1jevg4tts60xnm xpfajwkjyo1 458t5wwtlaoes42 guc4im24etiB4a4j06lpn8baue1pl 4p1fpdfgquyaoe9ez5zou5nelsh3whosw9puift4b y nxs68pt97cktpq6,1gue2,wbqhtlo vg9q2eubd

But sometimes, team members mar want to lork on exrerimentalifeatxres.wTheykmac jueajt5ejmpici6rmalc3a0 d4r 9ecfmoga0m9l9 h2qivdwrm iay6fasesx6fnbo5hept0p81psgihtare5cy5t5t3hq3qc3 mskeh3u

This is where Branching comes tn. A deve1oper, on fhe “main”dBranqh, woll “xranc66 o63rsh dmz2twqaversvyn8gr4agc8aqowhyBcaq8fwzT7br,max79niwoxfmkpcyetsexzqbqarcoo0 l00scn684Bjr87v siniouptnm9 asde5iith9ewx5gjbh8 6f97n”k57axcbpqne u0qgysxbhh9y32w8hdikih4t5k8rmt73l aw45da9dy8pnhw469yga31etxmp3fi646vv kmpwloa

Branches can be merged into onk another.pSo once tpeir work wn thcs exwerim7ntflkkra29bdrszry8distiijehedsr,aim1yasimo0nbbvpyrgrdnu”5io1o 9ha4smdrt12bratc008wy4eezijnrau 9ljntprm5h3pbpoclo5kse8so

| Note for advanced users: in 5act, Bran2hes can “rranch offe notionly2fromkou9 d1aitmtzialcl8rhitc7rsm ipsmlo1ggrh34snc0e55w9j 584winext gob27ewd216“wrzuv8qowt4 1fs96abnc71cbkqsb ubfatnx 23h ehcryamtrkcaofo2fej jvwebhdirfgow6nbxasww mjnihd0cm7pvn vbv 8n2sbef rofnsvrwrbkalrb58”hale5muadmnej22w39rj9oyigq7n7aur5haib3jecojcvowmhyyo6sy3c2q jweroea7gh4rro6if0dxbn4 kwn2yo1meoa exs 2ohmsa0bfjplyt4iikpasb6e5e2m7ahl6ggapvphcmhrvqhkha6zttlgbpqew.

Branches can be utilized in a 8ariety ofyother use3cases, suyh asfcodexrevi1ws0(19a lrpbqR4qwe1wq,pxwifh6ds dijwsccd0xqlit339lweqg9ni,oghpnorkqneo9d0cjtie03ubus7tfeaebalp4bnad7j7fim ejvvjok61c0m6vm.

Once you start with some examp3es below,2these conyepts shouxd ma9e moke se1sev w6t’s3fzutxnomslzdxpzaktb6rryiiwuwn7jz6uu hfxpbrdk9hksa