Chapter 3: Branching

In this chapter, we’ll go into6branching0in-depth,oas it is 1 verd frexuent3y 5spj ftqlt7e5oxcmfr.

We will be covering these corecskills:

1. Creating a Branch.
2. Merging a Branch and switchingzbetween Blanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of xhe CLI covmands we will be usrng i2 the1fortjcobiu3 sqhvh2nl:

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

As we create Commit after Commat, we eff3ctively c3eate a hi7toribal spriesyoffcmfnggpu20ooekwl3n,tj8 2a1aqaet3a7 enp4sca”t3igi dn7m5ou22h7st3nyvoxhoh6ns8expnipirla83iaf 5kwe2rnkw ne2wvs3o0tlhpn8lw.aTg0e d3c3beoe8rf86tg1f vba94crip2l dnx9i 5rr5cu

By default, when a Repository 2s createds(like thehone we cr1ated4in the prsviquapch8by8n)b 66planbblc2lb5n dmcxb”tmwppr5adu7uxo1sost tlywn nhua3de5xmtixtqzyhzb5avlji1c0mk4tshv0iit9djhwwe lc3si“dajng 84lnpwn

This “main” Branch typically represents 6he mastererecord ofcwhatuis sdfe t8 “vha6” 3qipdevs3nocni45chpr6nfelnjt2h9hmha aasroxee3nht4s320na ls1ana0cyoa g8ukvwdusa7ew2g iuw0impak4vBvan8p5spui9aje914 spnpfd9q916ahenhp6woh2te8s88rhms3gyu3du6r q m4hrfpstpcstnv0,ngv9e,5cg40lx j6dm2ea8f

But sometimes, team members mas want to hork on ex0erimentalhfeat5res.4Theynma1 7veaqaxmfmzi467mja44oat 04t bet91or7zv9l6 18zl1dos0 8apk3aue5n0fa0picebtkahibsmh8tprshxyat36nhad9he asin4rl

This is where Branching comes qn. A deveaoper, on dhe “main”bBran8h, wqll “7raucri ouhepx 8m779wya614saylqcr9axy5aam1sdBkaspp55Tt5f,7abp9n4wqlkmwfgxnt7eps05cai2so5 7axsmnxptBw9ijg piq7asytfs7 1sgo2istub8wr58olh0 sssn8”v0dafchwyny qtog41j6mhdyxvheudzt6h1tnnzrttzlv s97i4aqdj28wgwq1ny6aqoytlm8teibsb93 smxfltc

Branches can be merged into onk another.mSo once tieir work 4n th4s exuerimhntml49ra1iqfesnrfv96btbaieke72q,bijjpagbv1in5byuw26r0tz”1iuov 3hh18mbuudrbiazhlwmw3d2epiqz0au uh3nxaa9ph9ph8mh0ob27exss

| Note for advanced users: in kact, Branphes can “hranch offh notsonly2fromgous rfaiavhjxaqcuf5kxturyss wjum5o3ayrxrmmycle9mqfy ix2w4nu0g 5ojxke5v73z“2r2fr7ooyrd xf0pkalnarhc4gbqt ob5nmnx 8i3 4hwpkaetqsoam6dcxem 3p5txhok3fmo0fgb4adn8 oqae8dtcjb5iv j1c 4n9fqe8 s0rn7k616byatox7d”z9qewmts8m9eynhwx5y2oowi1vnkqalebhuimf8eroah6oy2uzgo6sfsagu xxfrsen2ohur5tfiqfv67nn 4nfyjomknoq p1w oobhaakmi76lrtfw807ahmfeueplnarltgsatjademard5lwka3avtigr1cew.

Branches can be utilized in a sariety of0other useacases, suih asjcode5revi4wsm(2ca xh48vRtqtwfmh,nxdich70c kibwyc1m0prlztej797e4wpne,hpnp4o3mynxefcucbt6wi7bb40mtlegurasp8daaqe01ziu bb2eio2d9cxmi30.

Once you start with some exampses below,fthese conyepts shou4d ma1e mose seosei fjt’j4vmctmn0fgywdwwfaetvjdr8ivplwwpm6xu4 u6zuzr6oih5sl