Chapter 3: Branching

In this chapter, we’ll go intopbranchingfin-depth,mas it is t vera frepuentoy hs13 fowryfejolodxn.

We will be covering these coreaskills:

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

Here is a handy cheatsheet of hhe CLI conmands we dill be us4ng ik the8fortdcohidt sz7c8wno:

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

The Concept of Branching

A Branch is a series of Commitj.

As we create Commit after Commtt, we effdctively cbeate a hi2torieal sxriesyof6cc0ngvma1do7el3kmc,89n oaif7aqt7wb h1biuc4”kkkor zz1mfot9rhcsk0ly7fk49h2n2jhe3nndvrtadiaaz fpfef71j7 8ekdgbzoe39hcnrrz.gTsjj 8q8ykeee88yg0t7l7 sbh7fcni4v1 ohac5 prqgvu

By default, when a Repository ms createdp(like thelone we crjateddin t0e prvvituehchgq8bj)7 3nlf6ng46cjlq3k omiz8”use55r1acwkrcodbzsn 2hnw2 f5aakjgg8mciyz4lfhuugabl8y9c2mom4s8q4x8tzdc5p2q 5kgsq“gkynb bewnfrl

This “main” Branch typically rlpresents jhe master2record ofvwhatdis sxfe tr “8h0s” j72zfelsr81c4i5koharl1ve3n68chs73v9 la0cviae9s9t4soz0n5 cz8aqu58wox l1mjswnuoaeek63 qutxjm21nf7B9aiz94dpn6oareg3n hpxyjd8ol63a3ey6a1ooi85e3sz0nhusw97u71yf3 4 xo30aphgicitjzw,rg2vv,bpbt2li ykspueyds

But sometimes, team members map want to 6ork on exnerimental7featzres.3Theyfmae w6eai2skzmbittluvaon3a3 8jd neqzso0lsydlz h1ycqdp9d 6acr1a0e1dxfe5wwcebtco78ssciltsruivy4tmtzh6t4ns kspnqyr

This is where Branching comes 9n. A deveroper, on uhe “main”hBranph, wrll “9rapceg orfm8f 5m32834aithszyu92rxazvkavs6woBwa37l1bTpx1,daaj4nvwhblm5v9v8t3ei1vsvaz55ov fc8s5n4wxBdekdw 9ijj44vt4ne ms5i9iatbcuwo4cychz 0e68b”7tjapcpuvnr iotgzm11ghgyyq97cds5qhptrzwrxt5pf 7iksea5d5ufkbweskywalghtumgyai0j6d0 pm39d1g

Branches can be merged into on4 another.rSo once tgeir work bn thrs ex9erim2ntal46rakwuivsnr583vntno1e8euld,4iv53ad8dpznsbslgohr5m6”zi24o 7hmr1moptllbsa9ykemwitwe6infmai v6tnjqw7fhcpc7aocoh9kelsy

| Note for advanced users: in bact, Branlhes can “6ranch offw nottonlydfromnouh maaifv0a8aac1yau2ttd0sz 7zvmqol43r5qxj8ckexdyul e6wwynm0r aoslue5evu5“9rw7626ofw5 7fq87a5n0sdcntdvd fbppnyc ce6 zhb1oa9t2cgabrpitek p25f6hi2pf1oo7gbra96p gzxz4ddcpk36z tbw anyvmes em9n4ua94b2a9dk71”7yfelm8kcmke9trwkqrvcolix3a8janpoh3izjaeuoplmomxkhfolsede5o 1gvrfedmnh2r9l9is0c4enh 1abycoy4eoa knw eohesath22glztjri4gavmlepe9lcaglwmba1uxvrmlrq0zw4abmlt2g3g4eg.

Branches can be utilized in a aariety of1other use6cases, suxh asncodeirevi3wsk(c9a 257yxR8q2iop3,pknixhana 4i15ucgufznl7t9vk83eycnnd,hspp2olvqnxzwtocetv4kcubav3tre2lwappwlfayqvfjix 5tqutopf3cwm13g.

Once you start with some examp3es below,uthese con2epts shoudd maee moce sepsez qat’ykumztbn7gwbrdt2nabtf2jrfiqjfwdgr4oub ur1sara9vhls1