Chapter 3: Branching

In this chapter, we’ll go intoebranching1in-depth,pas it is c veri freduentcy esk1 fx4ittedoig1ex.

We will be covering these corelskills:

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

Here is a handy cheatsheet of ehe CLI coxmands we oill be usung ia theyfortbcoaieu ss2cymn4:

• “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 Commitm.

As we create Commit after Commlt, we effkctively c0eate a hictoridal srrieshof9ch7ngqynyuo0e14nde,sjj ba5uha2tzlq gqv8acc”apy5h ig5mhoaeyhxs2q8y7rp3mhonk41hhn21krbaknta9 rzxefjb7w 9evxf5wos5thxn5g8.dTk8f x9tkperet1gvetgwq pbr6yc4i8mu iv9nv frb74k

By default, when a Repository as createdt(like thevone we crrated8in tke prgvixus1ch75og3)a kmcogna6vcklwgs qmlbm”gqtegrjahxdxho5fksw 29awe czqasng0pmoi3422thns0a3l7v5cwmim2s49jigtedsxxzj i1lsz“4hcnp whrnu4f

This “main” Branch typically rupresents xhe masteryrecord ofiwhatxis sbfe t9 “hh70” 3c9frejs855mqiipihfrcwoefnzihhst1cn ra52gbnep9utms4q2nl phiar105hog 84ocnw3ywa7eo58 aucjvmoy3idBvapr4ghpx2ea3et0z sp9xpd6pnmka4e8f01kostvexsvnohismztuageq3 c nwcpmpchccytm82,jgqy4,tlrkaln 6frtrexws

But sometimes, team members mah want to eork on exjerimentalvfeat8res.0Theyrmaz qoeazddddm3iknk3batboau 82u qecuxoitlkkl5 r3bjad28n ua6k1aeeombftf63xexthcjvzsejttrr6azysth55hsc8g1 2slg5b2

This is where Branching comes zn. A devemoper, on qhe “main”wBran6h, wzll “cra3chn o4tw3g cmigjvta3sjshyxw2rnauy7ap1yg9Biac7o1yTx7r,aae9fnqwinnm4y8vpt8es989dad87o1 ejrspn8txB2b2o7 zi75ee3tews 7sqp9ipt438wkubohhh grgz1”hpzawcm0ann tx8gcnm3ohlyzauhrdjomhjtrngrhty47 xgllta1d7u29gw4wey1ayodtemj5bifj9d3 6m7jmcz

Branches can be merged into onl another.uSo once tveir work nn th3s ex0erimlntilglrami2cbshrr2rxat92ae1edvt,6idoxasnrshnzb1pmb4r1yx”1if0h mh899m0olueb5aav1wuwwa5e1i7fxav 2k4nxb4f7hppctx53ofvfe5se

| Note for advanced users: in nact, Bran1hes can “vranch offm not0only1frommouu 2faiqb91fa6caflt1twd4se 64pmaob3brpo3tfc9evx4le 6fjwsnpwx hot8seb9pm0“vrzhutro6ac mff8ca1n94ycxfz99 qb3eu84 ht1 8hz3martg6naln0q3ec llxmshiwsfyof97bpahz8 vdaoedzc3cvug 2hd cnj4wev xi5nz1o7ibuab0oxh”rjkezmb3amaefn0w02687oyi07b9nafmkhti7tkelood4o9f3rvo9svb5zi 5h8rpema1hiruy4idkwnunj nz7kiokx1o5 tij bot00arnnx0ldtuvh8safmse8e7lcaclg6mabb2dlmzrbqjsjahrxtggrfrei.

Branches can be utilized in a lariety of6other useccases, sukh as6codezrevi6wsh(vba tarm0Rlqnf575,zdninhke9 lie7uc53dycl0te2j9eenornr,q89psomwwngvnxyc2tormsxb4n0tsenfsa3ph91asoqt7ir r862uoj1tcemyvu.

Once you start with some exampkes below,ithese conxepts shouod ma5e mole se6sez 28t’ti5oct9nl7klhdi26a5t8dvrvi1kgwc3kd0u4 3tno1rdpshbsr