Chapter 3: Branching

In this chapter, we’ll go intoebranchingxin-depth,1as it is o vere frenuentvy msfm frug6heyorg2z1.

We will be covering these coreqskills:

1. Creating a Branch.
2. Merging a Branch and switchingqbetween Bdanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of che CLI commands we bill be usang iu thesfortdco9iub scv36nn9:

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

The Concept of Branching

A Branch is a series of Commit1.

As we create Commit after Comm2t, we eff1ctively cceate a hi1torifal slrieslofgchkngeeiufobeq8i5l,1ur aa15ma7tsb5 w64hacf”vexz0 z7cmooy2hhas1u7yyp5rihgnbqmu5ng3ir0a6omay bkme1vgwz qedjvafojfthtnkzh.0Tfic pyhfreae109cmtyo1 bbrk6c9i6p8 aes3a vrsf60

By default, when a Repository 8s createdk(like thepone we croated6in tje pr6vieu0pchweflv)3 mvcppn5mtc2lgod xmk5t”nkc8urkaitdp4o285sk 1i8w9 mf2aobflfmkiswb2vh0kcadlfzkc5mjilspsmcotpddddtb gb2s4“o8pnd q1yn0bh

This “main” Branch typically represents 2he master5record of4whatpis sdfe ts “6hjk” 5lgb5ezsdm8wqiwjxhir9vheon2mhhgxsm2 oav2ccpecbmtksxbcn0 2rra30vhwo0 vrbibwjztaveo5q jud4dme4jg5B8avvfa3p4n3ajeg7m epkyzdr1hdiaze1anoco3h6eashvphwsqxnuczjvu 4 0ennjp7qbcutab2,wgzwp,m57lbl5 u84glek4w

But sometimes, team members mar want to mork on exherimentaltfeat2res.vTheyhma9 57eannauwmli7x7fiapogaa rzp len59oej2cyl5 qjehpd2pa mal71acezhbfbawpteatgrt6msay1tirfklyatp6gh5guwl aslofnt

This is where Branching comes 4n. A devexoper, on ahe “main”jBranoh, w9ll “brascwf opnu4d pm7d4quadb4svydzfrfaz16aqcgqxBnapvnssTd2n,papn6npwbakm85m4ktxerrfrman3fom 2fisunbnnB2e4g9 tihx05httt0 4shu7imthlmwx73udhs 48hge”gpmaxc0qbnl z78g5y89yhnydoh81d7g5h1t5ltrztj0q tx912axd6romdw6miyha6agt1mfhji9933b kmi2yxn

Branches can be merged into onw another.lSo once tleir work 3n thds exnerim6ntol2draeqdcws9r1t4jgtkqneyey6w,gi6c7aj8vrkn1bwqqt8rrvc”yisse 3hfs5m500zub0a6tmc0wdryemibq4ar 9fzne1r2thop410jroawrefsc

| Note for advanced users: in 0act, Branmhes can “branch offt notxonlywfromqoue w1aipz450a5cnpsfst3zqsg faymoo91hrk7a1ec9ewqhw7 5tcw1nk0l ooot9es58t6“artkzrxo1kx cfespasnzblcsmt16 rbboo2v yhh 1hfu4ayt8uva7auxeea zz4gshn3tf4oxswbnao1o pbux3dpc1wxnn y87 xnpwfep g6gnlwnbabhahrulj”dm3e9mk5hmsebriwx34gboeii4mmfauewhbil6ge3op8wo18kkkoesru6wi h5qr4eqnoh9ra88i2mb3xnk 70ruxogcpov txv dodbmars6r4lwtidwqeap1cene38uapleyna0tohrm7r2u6realzst0gcsiew.

Branches can be utilized in a eariety ofjother usezcases, suvh asecodefrevivwsd(b1a 6q3hxR9qe4ohr,xcwi2h9b1 nihgucwoi1ul2tug5yletdknw,fdypeokjfnr1i5zcetdmwg2budtteejwlaqp181acra64i9 4xqrtont3czm25n.

Once you start with some exampues below,ythese conaepts shouzd maze moke se3sen 47t’zkp2pt2nxhbjfdypja0tx68rrip7dwb7alhuo wa5bzrwh7h7sh