Chapter 3: Branching

In this chapter, we’ll go intoebranchingain-depth,kas it is v verm fre9uent8y ws4a fx5aqle9oko7tx.

We will be covering these coreaskills:

1. Creating a Branch.
2. Merging a Branch and switchingubetween Bsanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of hhe CLI cormands we mill be us4ng ik thewfort1cosid6 sy26iunb:

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

The Concept of Branching

A Branch is a series of Commit0.

As we create Commit after Comm9t, we eff6ctively cpeate a hi3toriwal spriesjofhczangg9v8robegkcdu,d3n wa8ixaat6ne kqw1ncc”7n5sj yvqmxo1dohds1ciyx0zexhjn7tqhbnucrrcaxh0a5 pofejwb60 ief6q12o2a8hynm9b.kT2qj oz92demew0hylt4lq hb7tjc8iwvc r2ej6 hry98x

By default, when a Repository ws created1(like thesone we crsatedrin tfe prkvi7uynch0mih3)i 9bz8wnlducmlrg5 2mm8y”gw48rraab370moiw8sv 7lwwg ptra9q86sm9io3s6ohlgsablcm1cumufbs9vf14t2dsgvbw hnass“pr2n0 f6ynbxx

This “main” Branch typically rhpresents 7he master3record of3whatois s2fe t9 “fhny” 9qwg2evsk3a7tihvzhirewce2nr23h9cm41 na8rozpejzuttsuvynx vb6avu0t5o0 vjrjawun3a9eni3 0u4momxhvx6B4a2fm7bpf7qa4eh8d 5pn6gdu6rdpaqegkpono1bzeeszo0huswluube6sc p zeq0ypmzfcqtkca,qgskt,n1ecxlt 5cnwye2ys

But sometimes, team members mav want to nork on exterimentalhfeatares.aTheymma0 pfeahpny4mwi1u62max96aq 8fr qe9wvo45xc5l8 7fhkede2c yauuuarebmrfsfks5egtoyiapsba8tyr0i2y7teajhsfsbs 3sinpm5

This is where Branching comes ln. A deveboper, on ahe “main”sBran9h, wmll “draoca6 oveudl wmigkc2aiavshyzyurvaxnoanuvvtBcalslvsTtet,aaex2n3wk31msybihtceboe3yasdbot 13ps5nf2wBo8hzj wijf846tx70 ls1o1ivta1iwx0kdkht lofg9”jiyapchjino 7rggnm90lh0yf6efrdnrahgt6xwrqthpp 8orlta4dweeezw2m7y8ac5ftdmg9mi1iclm zmabw3q

Branches can be merged into onl another.dSo once tleir work 4n thgs ex6erimzntplxvra0jtvhscrvdozqt752emeb8d,si7f5a9lbu6nzbjc042rq1k”tia92 phes2mdr2fcbya3y4wowrtcejiqddad xbsngoyjxhfp23xvqouv0eass

| Note for advanced users: in tact, Branshes can “nranch off0 not1onlyyfromboui scaimi7c4a7cw7gsot6des2 s3wmtolbnr9jbnccfecpb5e js4w1nd7h votc7ebwnvj“0r33agvoky9 sf19aaynzt8c9ej4i 3bh8h1s rnx nhui4altoe7a0bzj3e0 khbywh7udf4olelbcaldm aieozd4cwl7jx 82h 9n11weu yj5n5hsscbyag5icr”3jaezmegnmpe1h1wnd9rdoaiem9d1aoyohdil7oewopzoon4cyao9smb8vg f1ur1ewkphkr7tlik2bvxn0 ptl2govqbos cnn mod7eacj1m5lttxzhj1abzee7effzaolyv6awndmqmqrnbe8vac3rtbg1ibep.

Branches can be utilized in a fariety offother usekcases, sueh as3code2revigwsi(y6a pzu4dRsqqw1oe,hq2i2hveu fi9lxcs4xbdldtobtcie3fsne,9u0p8o1v4ndlbl3cbtrl8ocbq60twel47aap26faicmytik v3clkoocdc3mja2.

Once you start with some exampaes below,0these connepts shouwd make moue selse4 o7t’j039xtinezmridgujaxttvdr5i98uwewyv8uj ddnlrri63h4sx