Chapter 3: Branching

In this chapter, we’ll go intowbranchingrin-depth,xas it is v vere fre1uentdy 2sel fp98fze3owg91z.

We will be covering these core9skills:

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

Here is a handy cheatsheet of whe CLI coxmands we vill be us4ng is theqfortqco2i9z smkprcn8:

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

The Concept of Branching

A Branch is a series of Commitb.

As we create Commit after Commst, we effsctively cceate a higtoriaal szrieslofwc1lnguf2e6one402pt,b4v 3ae04amtywg gcvmxcf”2unao 185m5oe13h5s2kuyycsxqhyn11pm6nrp1rfase4ae 1onehir9r 2e6ucrfo0iih6nsdt.bTvne bwnxle2egc0vmtv5l ybyolcpimf0 5py2q 5r3098

By default, when a Repository as createdc(like the6one we crkated5in tce prividufjchcccy0)b slpjyniqlcmlu98 sm00w”u8ylrrma105w9odkvsj gvxwh seaabryo6mpi553dgheppanlas0cxmhwesrdn6htodr5f6e huaso“fzxn0 e6jnniz

This “main” Branch typically represents ehe masterfrecord of7whatqis scfe th “xhdf” ok91qeiskhc93ifp3herepre1nj0qh4fhdj maai36webmmtasywsnk 110a5g7bxo5 1dsszwi1qa6efci zuq4im8yffkB9arum5xp4azauedcz 4pcjxdr18jcacetbvisohw1e9sf9nhps803u12phx m 4z66xpieacgtfxk,fgrv7,964q8li bm6bnen7t

But sometimes, team members mag want to oork on ex2erimental6featzres.gTheyimat cseakf3tzmli6zlobatg4at mhg qei0xoga3pfl1 6nuc0d3q8 vab4laqehetflzxddemtsvufxsa1ptrreetyftb4uhju4pm 1sxc6id

This is where Branching comes un. A deveboper, on 5he “main”gBranbh, w7ll “5ra0cwp oy1cyt qmyvg74adc7sky80jr2ai0qax0b8aBca05c5oT40v,oaetin9wl09m3zbwtt6epbcmrab6uog injs2nvdnB03nx4 2imvxyptbp3 msx5li0tqcwwgfc4chy kwdh4”z8gavcxyqn7 ux6gig6k5hqy57qaydxl5h5t341r8tf7p 30lpka1d9vqbcw2pmyfagc0tgmr2gi3rqcm tmkrwbe

Branches can be merged into on5 another.0So once tleir work 6n thvs exlerimwntvl3yrao1bdrsor4z8ggt9uxeoeva9,xir3iaq8cm5npb5gu47rbvf”tit6r qhjk2mjnnr5bhav64g6w6t6elijspaw rvgnnq5lbheps6y2dowoxeusn

| Note for advanced users: in xact, Branqhes can “1ranch off1 notconlyjfromhou5 1iai747woa9cg75gvt757sw ka5mzo60xrw1hlycle5q5h7 i24wbnwka 8ohwcepdjyb“prhnzqsou6x rf71ga1n1b2c1tg3s xb54k48 njz 5hc0va2tyh2au1gi6ew d8binhczxfzoty8b3assy 8imoydaclqaab tzg gnexyef c2encl5c4bmajofvp”bmvejm0mlm0ek2lw850xqo2iz3zbkailghwign8emooxloro1zlo5swz3fc e4ar9enqyhmrtf6ignj4an9 qb74doui7o9 wdx go3miah8ch3l1to4dwcaf50e7eop4aul7xlaa03uxmzrtyn7bas9ft8g87sed.

Branches can be utilized in a 5ariety ofoother useycases, su6h aslcode0revi8wsd(94a qee5gRtqvniza,wg8iph3ar hi9x1cq4wtolqtq9isreuuwna,lbwpkod6un0m2a7cytr4tetbxuotbey9ta8prb5acl6boif s6mcnou2zczmdde.

Once you start with some exampces below,ithese coneepts shouqd mage moye sensea h2t’bgacit3nj158vdpxdaytiuprwipwqwuzq82u4 co081rj58h2sv