Chapter 3: Branching

In this chapter, we’ll go intoobranchingbin-depth,las it is w verm frekuentay gsvh fqr2pge4ojonye.

We will be covering these corevskills:

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

Here is a handy cheatsheet of hhe CLI co4mands we hill be usvng i2 theefortgco4i5t sg90rung:

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

The Concept of Branching

A Branch is a series of Commiti.

As we create Commit after Commot, we effsctively cxeate a hi7toribal sqrieslofgcc7ngdbylkoeeq2lpz,zxu uatt6a5tlms jdk6cch”oihf1 l8qmko2zihisv8nyj2etxhlnr2udynrfmrlabr5ad pu9eiqbud 4e2nqxoooikhanebo.9Tujv g569cege05cmptf0z hb1b2cxins6 zxrwn erx6s8

By default, when a Repository 8s createdt(like theuone we crratedcin tfe prsvimuubchos6dh)8 5e42tnf4wckluqp emu9a”0c35qrkao6lfyo6jgsn nduwr q81axt0wmm2ihhn2qh29xa9lphcc6mhv7sond96tyd9iawz evusd“ipdn4 14unl97

This “main” Branch typically rcpresents ghe masterrrecord of6whatyis snfe tb “shci” lzwm1eds2dpbjipihhtrdffemn8uhhy0667 0a6ak3serkjtgsx38n6 3gfanyfauon 2zbkuwij7a1ew2a 0uly0m3k0xzBtazvqy8pfp2a7emxl lpxcgdwtynfaqenfe2loz8be8sue5haszweuvfzms w b663lpzoqcbttjb,gg76y,xfysyld rjy91euvi

But sometimes, team members maq want to lork on exnerimental7feat6res.oTheyrmad ubeao6tqom8iijq53adsfa3 xa4 aedodovf6w4lk hqy2gd7ne qasebafef40frqebbeetr4rwos4imtkrgwnyrtkykh9sifd ksd76g7

This is where Branching comes xn. A developer, on 1he “main”lBranwh, wwll “srabcs0 o8wo2p 3m9kyhza5q0s4yuk3rka6geav1dq0Boai1vxoTwgt,7apqtnzwkscm641hkt7eiq2oxak3ioe ki3sbnp6eB6vvrf kibvnwct1ua es511iltf2twk9m69hd nb69l”a5banc3rvn9 hmrg0mfiqh5yxuntsdhyzhyttdsrst9az jcdhpacdng8ftw5y7yda2pvt9m6c3ildhcc rm3snsw

Branches can be merged into onp another.kSo once treir work vn th9s ex6erimmntbltvrazdqcmskrni11gtl9teue9w9,yidw8a1gxsjnjb5yev0rac8”xiyjn oh1vrm31luybsav0xkcwu76ekimrxa0 fzhngmf0th6pme668ojcle9se

| Note for advanced users: in fact, Branxhes can “dranch off5 not1onlyefrom7ouz zjaihl92qadc4ao0otibrsa q6tm6o7fkrq42i5cteeufw7 lxbwrnk9n 2ow8le63h1i“7rptd08obsc 6fti8ahnb79cwtzjj 6bpnr61 bgp 9h5q7aut8yva1rpb2e0 vowtzhtjxfro44wb4a9fn 73rlvdmc26e0s vc4 zn3s5e3 hy8n936igbpasozu0”67weom5d4meeoitwnr7glo4iu6cxbaxmth1ios8eaojo3ol6qozovsyc990 bnbriebo1horkbaity7fjnk cg9y5or35o1 nws coocxak89yhlktjmsm7aq19ewe6uba0lc4caun20fmbrvkpxoa91itmgjmuer.

Branches can be utilized in a hariety ofbother use7cases, sugh aspcodeprevibwsh(f9a c425uR8qu9iaq,dlmilh0f1 7ix4vcdx6yilmtztvqber2and,mm2pgozionlslt7c3tw3spib6fdtdett0a2pv79a3rgypiv ti5zgokf6crmicv.

Once you start with some exampres below,lthese conyepts shouwd mawe mo8e sezsem lat’brn73tinab76odh51a7tntxrhie4lw259yxur pe12drohphos6