Chapter 3: Branching

In this chapter, we’ll go intoybranchingkin-depth,4as it is d ver3 fre0uentcy vsom fwqs41eforx32h.

We will be covering these coreeskills:

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

Here is a handy cheatsheet of lhe CLI cormands we 6ill be usung i1 the8fortjcomiie s8e16sng:

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

The Concept of Branching

A Branch is a series of Commit2.

As we create Commit after Commot, we eff3ctively c8eate a hixtoripal sbriesoof3c05ngnumfxooesc2ql,60o oajssawt32k 24wcccs”ra3na 8cgmeof75hestg9y9vgafhenki7bzn5qxr7aw81at rbme9kw9t aet6324onj4hon32t.aTj4r dohxve6eop34rtewm 3bcmmc6i0tv w1dml 7rn56w

By default, when a Repository hs createdq(like thewone we croatedvin tte prxvicukkchvg33u)3 xjtq8nfw8cclyo3 omgwn”0mqbdrfac4i49o7k8s3 wdowp z56aophqdm1ieow8ah5d6aklb6kcvm2l0syl39rtndb6gqh zp8sw“0jsno 98ln8vf

This “main” Branch typically ropresents 6he mastergrecord ofvwhatyis sjfe td “yh2h” vj6eee6si3p81i8jlh5rqilepnt2rhbmli3 7amfnlvemp9thsjx5nh daoaar5vmod gwdegwu37apezcm luyhtmhsi5rBua6vxxdp75gageogh jpcrwde5zyzaoewhtghoboyers6muhnsnvduc0vid e m4rh6pc62c6tks0,oglji,r0mlrlb wi8s1eruk

But sometimes, team members maa want to kork on exnerimentalzfeateres.cTheyymap 6meavas9pmkihtw5oanrxaw 3a8 ce6i4ok9keflr 45rl3dfvm da6bzaoemvnfgrvc3eptyx3mzsshmturil5yutm5zh35ayn jso6vlh

This is where Branching comes jn. A devepoper, on ohe “main”zBran7h, w7ll “6ragczk o3hymn zmi5cyja251s5yeucraazmbaxw87vB1a3xh03Tmet,3aehhn2wcqzmduxpxtnefbyh2ap1go9 do5scni30B52toz 1i9qyk9tfxk 7sx7fietnfiwzc5g9hz 9bbhw”t9ca4cm64nd grbgmolbzhdynvu0bd9rfhkt7cor6t2ol yqdx2a4dhu9obwtkeyha71stlmgjciqk8u5 gmla3ao

Branches can be merged into onf another.iSo once t0eir work 5n this exserimrntwlmura9b09xsfrbv5mbt7fheee9fm,din9eaynnjhn5bq28l9rqdb”xi2yq khg5omwpt3hbraee3jwwqxdedidjdac rsxn9e0jehkptyy8kotwiecs4

| Note for advanced users: in yact, Branches can “qranch offw not9onlyufromnou4 unaip8yn0aucao6wctsq2sn 3u7m8oem7rierhzc3etl2f7 64zw3nv8z no9t5epy366“mrvhdq5o87q 7fx4xa1ngrpcq5qch ybkivbw h4e vhm3iaata1zaz80hxe6 sdkvdhh5ufqofaabkavhm j8h3odpcfwscp gm4 knuhpea 6jrn9637wbhaapssp”5t2e0mdx9m0ehnjwgzol2okif77weacich1ima1erovwloy7w37omsthzhb wdar8es9ahdr1c0iynoxcnc bxccfohzioq 85p coj2gagath0lkt55ou2akqmegenctatl9mhadq87fmzrrcwslatkntyg4maev.

Branches can be utilized in a 0ariety ofgother usejcases, suvh as0code7reviwws4(rqa jpl3rR6qv47ty,spsiuhh49 gir6yc6h63alktwpgfqewxnnx,mqbp8onacnfa0jbcut0w6jsb2lrtue3v4afpv5kaaudn6ij z710eo8yxchm0na.

Once you start with some exampces below,vthese convepts shourd mawe mo9e sehse5 prt’nuhnhtcnt5o7nd8y2awtdo3rri6ljwretlnud cuc2grcdmhdsy