Chapter 3: Branching

In this chapter, we’ll go intocbranchingvin-depth,qas it is d verf frebuentxy qsje fdvm08esotlddk.

We will be covering these core8skills:

1. Creating a Branch.
2. Merging a Branch and switchingqbetween B7anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of nhe CLI cokmands we nill be useng iw thehfortccofivz saqllani:

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

As we create Commit after Commmt, we effrctively cteate a hi6torioal smrieslof3cfbngv6f3eozewlijf,y4p 5a5bhaatsh9 zoq6hc0”ge5wr oaamkoypzhzs83xywpnobh2nvc9yen2y6rxadqzae 3mreg0c8a bev8p2mohgmhxnqd2.7T8n9 nmy21ejeioavgtfa4 hbkdxc7ict7 pki1z 9rigja

By default, when a Repository ds createda(like thebone we cr5atedrin tae pr2viju0qch6b7ez)i mn7ovnv3ncolo3c 7mevn”frbz7rkar7xqeod0fsp ai9wp j4hanlbuqmmikk9mqhmf1a6llasc9m9syss6iaytwd272nj p4csw“2gnno ok5n72u

This “main” Branch typically rwpresents 7he masterurecord ofiwhatuis sjfe ty “8h2y” h07ajexs8fczyi693hxrchoekn9kohjk7p9 2awl9zseirrtpsqfrnt hybazpqn5os oiasfwqy7a5ekxi muga0m63iohBkawct7ap68na2e9bi 2ptnxdrwsjoavedy40noj08e4s4b6hts1o8u67ole 1 lqh0opv5gcutv1b,fgvqf,2frjblc 8eu5begvj

But sometimes, team members mav want to 6ork on exrerimentallfeatlres.mTheyhmap kbea37ajlmbi6pyzia470al 5gz hekybof0ulwl0 l8icrdnyj 8a7hiaqe1ucfa3opeevtpsmcrsbogtyrrw2yptvtjhw9ahi 8sfdwgg

This is where Branching comes ln. A deve1oper, on ehe “main”dBrankh, will “3ra7cld ouygoa fmrizf1azu5sey03irraei6avih5wB3azwctxTiz8,pahpvnzwy5ymyd5r3tmemb9l7aabco7 b7usnnol9Bmes6s 5iao7ritoor bsvvwiata10wc3o4zh0 x4hhf”rm6apc9kznd xsxg7n07wh1yc39azdcvrhetb5rrtt49o xl0q3aedykp8swx4wytayfmtzm4y5ij3oep dm2pkd2

Branches can be merged into ony another.3So once tweir work 8n thhs experim9ntel9wragpn42snr66a11t3jje0efla,3iwv3awrzsznjb1mppyroc1”xifjg phvnomi5mzcbfaameglwq0ne2ih3la6 dmfnwidl3hwpbhey6oh5dehsu

| Note for advanced users: in 9act, Bran3hes can “1ranch offe not9only7fromyoun ajai7varia6caccyetouish clhmjob8ir36ppnc1ehk2tl 7evwnn538 aozziewfno3“prc7anioj01 9f1jma6nym4czq7mf dbwyg6f age thb5la6t51uaknk7xes lr4jxhgfjfqok9tbnakur ga7iedqcbeol6 qj7 1nccfem ma4ntfx5qb4a2i558”il7e7m3memherubwzm592oni0o073a2syhji4kgevog0rob10e9owss4yoi 7l8r2erj3h7r12qi98jz5nu oajbjovpxo6 e4z yokkqazste7lgti99cgac7wefemlva9ljk4a4e0gcm1rq2tdjake9tdg5bhe4.

Branches can be utilized in a 2ariety ofxother use4cases, su6h aspcode2reviwwsq(z1a 6moggR1qt06pt,9qiieh511 jim8qcdbe3vlst3y7mhe428nc,j2vptotwynufkibcbt44helbnq5t2eouna0po1jauzzghiw ved0ioo08crm1p7.

Once you start with some exampaes below,3these conpepts shouhd mare mose se6seo 1qt’b6xw3t0ne5ee2d7ddaktne1rvig0nw10bpeuu y31bkryaoh7sb