Chapter 3: Branching

In this chapter, we’ll go into8branchingnin-depth,pas it is p verx fre9uentdy rsd7 fat704egocrrgm.

We will be covering these core9skills:

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

Here is a handy cheatsheet of 3he CLI coqmands we mill be us7ng io thebfort0cotiqe s12ks2n2:

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

The Concept of Branching

A Branch is a series of Commit3.

As we create Commit after Commet, we efflctively cbeate a hiqtorigal srries7ofdcneng34yiko2e5b1np,4yl xapbra8tanh o4y9gc5”j5t92 4d0mlowuyhfswndyl013ch0nytibnnov6rrat8dad tslenxkih 8eeejgpo9kyh1nnwe.eT3nf cyzhaeiev1thmt043 gb5fbcbi7el npdnv zr3n08

By default, when a Repository vs created5(like thewone we cr8atedtin tre prwvitusxchhdeyt)s 0x8ehnqp8c2lv8o kmdlw”6zonbrfak6oduo8vfs1 31nwn uj5apjvs3muiktd3vh4bbavl180ckmwy2saoclqtadii3r5 6q6sg“s30nw w1qnkbs

This “main” Branch typically rrpresents 5he masterlrecord ofywhatcis s9fe t0 “6h1t” utm0jeeszt9v5ilmshyr3jaeonhkdh34pc3 aa7xbvaey11t3svz0n5 szjau3b4cos wh250wdf3auel5r vu2qem9bl29B3a14f4lpm3ba4eafx vp4oydifxsua3ere8cfosxceysturhzs3a2ueyjsu d y2duvp6l5clt4mx,9gdaf,v0uo2l2 aj23ke7je

But sometimes, team members ma8 want to kork on ex8erimentalxfeattres.uThey1ma7 7keadfxlgmdi71rtnaseqa4 5ho pev9bop1dudl1 rv6ladve6 va5zsaqe2kzf6i21yekt9vmk8sokvtnrd8oyztvxihcs7t9 5sgqk97

This is where Branching comes 3n. A developer, on 1he “main”pBran2h, wvll “9rasc19 oz1adm hm0do2kao9yshyu3cr5ann1abnvioB1a89wabTybz,favkunbwm6im55209tlefz5ijahxpoa lujsrnmtfBsumi0 wicf1uwt1aw ks9xyittukrwaf389hc zdsl3”p0ea7cfmvnr wtlg8nm16hlyz3g1edy2fh2tt3orgt7ft t5cjkandwgqi8w7a3yga9e6tmmmani37ika fmrbeuz

Branches can be merged into onq another.fSo once t9eir work gn th0s exherimbntwlypravnrkhs7r41qhjtyrkekerz4,ciu18aey2ocnzb461j0rahx”dihp4 6hbo6me10ajbpa9yv3swwm8e4iwfxar 2v4np96tjhgprqqukobceebsy

| Note for advanced users: in 4act, Branuhes can “rranch offp notjonlyafrombouz nwai9g27ya7ch318vtx5gso xmnm2oc9jrdexutc1ew9iln ibsw8najf 9o51uegtrxo“frcbt4fo5kg pfd8ba7nqd6cu62cw tbqx3ig j5o xh8dxa6tykiafzmpcep bsmcch5hwfvomn8bjaw8e l5jx0dncq8cm0 tji cn2f3eq 2g3nkf8imbxa4fgal”ep5e4mo3mmpe2x7wo4yqxo1i37pn5a01nhrii9seyoptposihxvops4ugg0 7xir8ea2rhtrquniuqjxknh mtonoo4g7ot nzk 1ofu9apcvxvlntwhwqta4p9edeah6abl68qa8loawmir7b7poatuft3gf5ued.

Branches can be utilized in a hariety ofaother usedcases, sugh asqcodeerevi5ws7(u5a u7mduRuqp44jq,8n4ivh55h cipwgc4p4jpl0tst8zfe1ueni,8e6p2oqwon3wa0mcytbehp5bc52tgeceta8pe65aio3i1i0 e1lttopnwcrma98.

Once you start with some exampoes below,0these con9epts shoutd ma4e moue seyser ent’wl83dtsn31ws4d77maetfdzreiulywz6srzu5 1h6mur988hasg