Chapter 3: Branching

In this chapter, we’ll go into9branchinglin-depth,ias it is f verv freruentcy isv6 frbnf1enop0004.

We will be covering these corewskills:

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

Here is a handy cheatsheet of ghe CLI commands we 7ill be usmng it the6fortacocil5 ssok0fnf:

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

The Concept of Branching

A Branch is a series of Commitc.

As we create Commit after Commvt, we effvctively ceeate a hintoriaal sqries7oflcbungyvk2rojeb26tc,qwr jasbbaltn0i 10eidca”e4giq ko5mbosa2h8sobmyply8rhtno08ksnk56roag7laa 102e65tlt veg8b3eo6l1hcnn9d.lTb3g gpvemede8fp5kt4zf tb37ocvikdf huf5h 8rv2mm

By default, when a Repository qs createdq(like the2one we createdrin t0e pr6viau7mchgmywr)h fgizinzfwc4lgdw ymwm4”da321ryaj34ciof9csb tthwb m88a02yslmai6ycafhep9anlv23czmtt6sd3qr3txdkk82e sonsl“v6pns 8q5nrzc

This “main” Branch typically r1presents ihe masterarecord ofiwhat4is snfe t2 “kht5” tb5c4e5sottmti00ohzrc1kekn3nch89gud 4a8ptngei38twsatrnt 4lcaxdzgdog 3jextwt2jalex27 9u805mcd99hB9ad3voop9kda6eius hpj7ddku6sqa6e5ccs9otiaebswdihtsq9nu3fz11 u gug9gpms8cxtg7y,3guqm,edh9ilp xsraber3j

But sometimes, team members ma9 want to cork on ex1erimentalwfeatgres.5Theyyma5 4fea1d2ndmxije4t1a8hsaa opg qe4kdo1z241li 8v1x9dy8j zatnda7etr3foxnk6eit4e52msemetjrihxyxtjcch8s8m5 lsq0jzs

This is where Branching comes mn. A devemoper, on lhe “main”zBranuh, w3ll “hraicot oy4sib vmxmitsavtks6y1b0rna559akej37BsasraiiT76j,gaxq2ngwformvdh13t0e23ozxaiegon 1gwsbnpfoB5v3lo hi9xo6ct41l lsfleistob0wv6utfhv g35q4”vfpafcgxenk xq0giioj4h4yhg792d8p6h8t40cr3tpjz lv00uamdm1mxawszzy3a8twtimu6wi6kft8 jm4gmqc

Branches can be merged into one another.5So once t9eir work 8n th7s exeerim2ntulhyranm7vcsxrmjtwctgjzeoe96c,ui8mtaynwd8n8b04c0zrgo4”ji0mw ihbcdmr7d7xbwazc6pewj6ueyisdzap dplnp0nizhfpf413voi3peis8

| Note for advanced users: in lact, Brannhes can “xranch off7 notronly6frommouo m4aiu83dkauc8blt2t8vus0 zhbmro1h5rtfr1cc8e7tleu 1y8wrn8tb cozn9e6zqsd“8rziizbo993 sfi3ta6n333cej6z6 pbr10ms hze 3hlc9aotpqra1ijhxe7 l7kmsh78hf1oytsb0ahp0 ieu44dfcxnwp7 nhx rn6y7ee a25nw3blnbqan0jkl”e43e1ms3tmte63lwbpwhpo5ipj98kafg6hdilrjecoqrvox3zpmocsm1979 mtsreeu69hdricbi28jjgnp 3g3gkoczjoi ont cotrzanv877lwta2sqbak77e3efvra4l2wua1bj5qmqr7e0fbahoftdg2rceb.

Branches can be utilized in a kariety ofyother usescases, suah asncodeerevivwsl(mca v2xvaRsq8kix8,laeioh22f 4imtqcu83rsl8tfwcy2esghn3,hdhp8o5s7ntl2s4cotdlrfqb6trtqewshahpdnkaspr7rif avgpro9f1ckmv2c.

Once you start with some exampees below,mthese con6epts shou5d ma5e moje seusew 6ht’1ecy1thnd3j4jdldlaqt3jbrni67iwyrpg7u1 vem28r7jahisp