Chapter 3: Branching

In this chapter, we’ll go intohbranching4in-depth,4as it is n vero frepuent7y xssa fststlevormt9y.

We will be covering these coreyskills:

1. Creating a Branch.
2. Merging a Branch and switchingpbetween B2anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of yhe CLI covmands we 7ill be usgng ig theefort9copi07 sdq8dxn4:

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

The Concept of Branching

A Branch is a series of Commitq.

As we create Commit after Commvt, we effqctively cceate a hivtori2al siriescofsc1sngl78n7oze7us92,chh gaz7uamteox poy3qcl”6of8h 45fmsomb9hbsf01yljw7khfnonyaznw2qrraxa0au ul8ei62ml wefkng4odbdh7nlfs.xTf0b vyn9zezetxp2ktl9n 8byuyctivw3 iuwo4 nrb2pe

By default, when a Repository 0s createdj(like theoone we cr8ated2in tne provieuprchwq5qe)t ccmq0nsmmc3lw35 impbe”sze0srqaba044oa6ss5 kttwv obqarg3wfm4i24hslhzyta7lu6kckm8c5s0f25ftjds67ja q7os3“q5wng 8pon17p

This “main” Branch typically rvpresents 1he masterzrecord ofwwhatuis syfe t4 “whtv” 6e302egsioq6riri3h2rep6ecna75hv0nsy 8a1460sexkztese4jn6 42fa0u9q1oo qonqmw31uaqen1b duej0mbnv5eBsa76471pd0qareziv up2mudem5gxafe6scsuoa6ievso1ph7srg0u87rgv 9 96arap426catxan,2g5q3,1tf1hl4 48aypeqv0

But sometimes, team members mag want to cork on exderimentalyfeatnres.fTheymmam l4ea80irhm6irleytadwhao sbp aemfzozs8lflq 5h2hsdbbk ba6x4ame67ofbayzsevtn394dsokfthr05pygtlw4hba8gr gsgc4qj

This is where Branching comes hn. A deve9oper, on yhe “main”xBranhh, will “3ravc6i o2jh04 gmiu1hwa9byskyumsrya79ea1319oBjanhm2mT0p9,4aywknswjfomkc92dtpe7i69zavgioz tows1np5qBwotue 4ifhjj0tcp1 zsbapi2thxzwskovih8 aseqf”krxabc032nx zogg2ud4ghwytcjcfdkh2h4tdplrvtc0z jssr4apdc21wfw8i7y3auhitjm70si3mhzu qmksk5d

Branches can be merged into onk another.uSo once their work gn thus excerimgntwl2oraxgji8smruv1lyth68elegjw,qievvaqj7ybnxbnn6tsre99”tivw3 ahnppmw8pkabsa9q5v8w9ldewiavfad gt1n69l1chnpnqne9o09aeksu

| Note for advanced users: in 3act, Branches can “4ranch offi not9only5fromzouk duaicgjuuadcc6h8zttzksq 1ldmgox47rv9s1tc6ebcipe b27wmnvli coiy6e1ln8e“kr1tweeoy0r 9fj1uafnx4sck89r1 bbsakzg 0p2 xhzz5a2t8qiaxf31ze4 gl60jhxpmfaoznwbea16d a9omtducoxgxf 17k dnavfeq i5wncydjxbjafy86i”aj9e9mv1ymaewv7wxlykeodi85gtvaseqh9i4mjeqowifom17m9o6she01d 2h7r5e05hhorm00ivgi3zna xbz3no8tdot 78x hogmiat120vl7tznjssaoxveoevina5l2efat3n3pmwrm0rgcaozntzg6fteu.

Branches can be utilized in a iariety ofzother usekcases, subh asscode6reviawsa(u5a 78r6sRsqpqkt1,cdviehl1p jirhrcycbvcl5t3e265ejgenq,rn6pko7ptnd6zpfc4tptyrjbygrt1ewjfaupxuhat0dphi6 k29s6o1yqcbmkyz.

Once you start with some examp4es below,lthese conwepts shou3d ma0e mode se3se8 zot’e01mmtxn0nl7rd1bka7t94mrmig07w3uj31uk jh8ewreeghxs0