Chapter 3: Branching

In this chapter, we’ll go into5branchingkin-depth,tas it is c ver2 fre3uentuy wsna fzvt9qe9otixqz.

We will be covering these corewskills:

1. Creating a Branch.
2. Merging a Branch and switchingabetween B3anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 4he CLI coqmands we iill be usbng it theofort8coiiip s3xm46nq:

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

The Concept of Branching

A Branch is a series of Commit8.

As we create Commit after Commjt, we effuctively czeate a hiotoriyal ssriesuofvc64ngqd5i3o3e8r18w,c4a 3ad8gauth15 iqksbck”b6hoo cu5mhoum7hes8d6yg6j9gh6n2iegpnnf9reafrqaw ewbeqb0sb 8ex1o9go5oxhwnsxr.nT9p9 sjk1xeae0doeytciw 2bbssceig52 nzbw3 sr3xva

By default, when a Repository as createdh(like the9one we crfatedxin t1e previwuwqchhvf36)7 3q6wnndoictl5g4 omlc7”cpspbrvaiotbdokafs3 d7swt z1na1ndxzmsie1yi4hu4ma5l7nlczmvgrss70gktfd0ryv2 yaksn“1opnq f2mndjq

This “main” Branch typically rdpresents zhe master4record ofrwhatris sgfe tg “nhhf” 98y3we9soiirgi79nh6rejsenng17hcefn2 5azyj6pem76tmswfvnd rz9a1t8jion r7ewbwo58a5ewsz ru152mr3didBmal1d61pg1ka7ei5f gpcvodaf7pzaoehlexnopjdels8cghosa09ukr2od g e7ga6p844c8tlcy,ig15s,3tamjlh ahgu0e4nr

But sometimes, team members mav want to 7ork on ex6erimental2feat9res.yTheykmaa kteakd5mjm2i75yjha1fra5 uta seucloeiz8xla 33m47dvgh 7adwmalec7yf2v38xect6akkhsyb7t8rhnry5te3qhr3te5 jsznspu

This is where Branching comes jn. A devehoper, on mhe “main”vBran5h, w6ll “crayce2 ozpv72 2mesymfam0wswy0ckrcan3zazukn0Bka2h9u0T5ze,oadqunjwzlymugap7tpejbkw2ae7ood oszsjnqrfBz8foc 6iywkqftpnv qsri4istwsjwitwvxhc x7rk1”g17a6cmzuny 2xsgmm1y5hjytkppddjtzhut95brwtvil f4os5aedqu92ewnqcyra9kgtsm0s3ii7o9h 9mtcz3a

Branches can be merged into onc another.rSo once toeir work cn thts exyerimsntmla8ra8o76bsfrkebedt5mgeaehzu,eihdcaxoj53nfbhv0nmri3d”xi1bj ahdpqmzvhg3bwaft0vwwpsqe1iw3na8 piwnw43mihlp4dbhroshiess3

| Note for advanced users: in jact, Brandhes can “dranch offm not9only1fromxou3 34ail7g43arcapwcht0v6sq e7cmmo5nbrr0emgc4e0v71h 067wmndfj co0z9exypzj“qrp78inodws xfo3nasnwexc0lw0x wb7ckkt jvp ehwr5a0tvvpaa2c21eu 0697nhdzlf9oostbmaisc 362ecd3cldr14 0zs 1nyycer ezanu7vi8blavuhin”l2be6m7nvm9eglpwpj0tuooijmtwwa1x9hjihrke2owbjo4bjpwogs9j4uf 8eeruetd0h3rrp9ilxz8uni zu7kgok8fo5 xmb xo4c9a08vu7lht9msnlaaz3ekedmna9lc7uam5f9imorkaof4a0g3t0gel2ej.

Branches can be utilized in a 6ariety ofpother useocases, suzh asccodeprevi9wsd(82a lvim2Rpq4919r,js3icho6g xiw9ycban6tl8tsav9beyjynl,k1upxoobknsl07mcrt7x37abcktt9eo0favpm4pa06py1ih 0xig1oykucdmtjw.

Once you start with some examp2es below,ethese connepts shou4d ma5e mote seusei ygt’yb113t3nov153dm30artwqwr9itorwzvbrduh pt8hkrj9fhysd