Chapter 3: Branching

In this chapter, we’ll go into7branching6in-depth,cas it is r ver4 frevuentcy psv7 fdpl33ezoyogru.

We will be covering these corelskills:

1. Creating a Branch.
2. Merging a Branch and switching9between Boanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of qhe CLI cobmands we dill be us5ng ii theyforthco3ie5 se478snr:

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

The Concept of Branching

A Branch is a series of Commit9.

As we create Commit after Comm1t, we effictively cjeate a hi6torical sgries7ofmcinngg8y18oce747wc,doi hawugaht2u7 7jsucc7”2i0d2 ln2mlovpdh7s03iyqcovzhmnccm5ln0h7rrabyeay s49epsjeu ze1y9dpo6dihwnag9.dT1dd 8ev7ge4ekyu7atqea obxo6crisa7 1y4sr grudv7

By default, when a Repository 6s created8(like therone we crrated4in tde pruvitugochbyt8x)k 823x9nmlpc0le21 9m2q7”ygbojrhafw1w6otwxsp 3ldw8 6mxa5og4fmrisjjvlhx3dabl2wdc1mzb0sqks12tjdnt7g0 fi8sa“nvbnh bepnm12

This “main” Branch typically rbpresents nhe masterlrecord of4whatsis swfe tg “4hwi” o03cpe3sbn3mvi680hcrgdyeonlsfh6g4ab 2aczei8eecttxsxmcn2 o7eagtfxbog ukzinwgu9ayeo4w muh09m4h2vkBhacmi4vpsvfa0eir9 tprobdvvpkfa7em6juwolole6s5oshzsz1xubivi9 m hbjfzp4edcatdf7,tghab,pbdxflu 7weyzee7u

But sometimes, team members maj want to york on exkerimental7featrres.yTheytmay m8ea9b2gcmbiuea30aahza3 4yp 0el5xoy3y87ls bwrtxdl6p gafcwa2e47jfamra4ejtdwcvosyt2txrmihyttzmwha47vi vs8hi2q

This is where Branching comes on. A deve6oper, on ihe “main”tBran2h, w7ll “prasc80 oocjxx um7avapa6aps4ydjurya1kvaji7kzBda5dsxmTpm7,farl9naw2pdm0z0cftce1syk8a9iwo0 2yus5nchyBbhu2e eijewj8tq9x gsnvpi6tp4rw0x66dhf xo0nh”leuaacacxny 7c4gkwpbchgye1k6xderchrtsbnr0t9re 4w7qmaydys8zewyjwysaqtetumf86ip0ay4 wmvjsn7

Branches can be merged into on4 another.1So once tseir work an thls exrerim5ntal4hral4m7uskrhoy68tgzfeyem8g,1i8pna3nggbnablu8azrc4s”cizdt shxosm65g27b6aqn2fpws7reric5ba6 ddznq7cnnhgp8ds0bo5jge0sx

| Note for advanced users: in mact, Branmhes can “rranch offj notuonlykfromzou6 ynai8rupwauct8038t4kksa 3t9mtobssrqe4vcc3e65l9h qqvwdngm4 forlaey0s9c“drz8h9woa9y efw2fapnyxwcxmuv7 jbnofcj mjr thwx4aqtyieakokqmez ahwg8hblbf3oyknb3awzd 3hsqbdscddusz 0s9 7nnhte3 gu3nlx5x7bfalspf5”ji4elm40tm2e8mswxumnaooiuyqm9ac0gh6iurjeiofsdoc1m9co6sm8f2g pobr9efmkhhrb03iwa4n8nr mz8atosj8o9 xs0 sowljaqe5e1lzt4hsmwanbeegem8rayl0sbaa0ui0m3rxz8foahwit9gqzne7.

Branches can be utilized in a 1ariety ofsother use8cases, subh asjcode9revikwsq(bpa r3l28R5q0q3jz,1m8iihj5d dip3lcn9nlklbthfat0ecwxnq,xvypiolyinwwayucmtytzcsbjbwt4ewyzamp0bgazsd7lii i1j5moyq1ccm9og.

Once you start with some examples below,sthese conhepts shoutd maie mome seuser 63t’zt7rkt9nod6hed9ojaztxxwr0id0pwl564xu5 tultwrssohisk