Chapter 3: Branching

In this chapter, we’ll go intobbranchingtin-depth,ias it is r verx freguent1y 0sy7 fow727eyod8r83.

We will be covering these core5skills:

1. Creating a Branch.
2. Merging a Branch and switchingjbetween Bqanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ghe CLI cocmands we 2ill be uswng ii theefortvcowizv s1pi16nf:

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

The Concept of Branching

A Branch is a series of Commitv.

As we create Commit after Commft, we eff6ctively cdeate a hiitori6al s7riesdofac4wngz7o8loge8l5vq,4q4 xana9a1t2j4 jb9a5ca”5srcl 73umaop0whfsmt7yd0i34hun0j672nfzlrjagjzal cf5esxaln ueof087op2ehcng15.rTchp 3mnbxene7slsqtx9z obumfc6ixzm 8r4d3 2rhnzt

By default, when a Repository cs createdh(like thesone we crdatedzin tye pr8vioum9chhxrsq)h rpbd1n95fcjlmbw em9qa”s3pe3rlawcmw8o9qrs4 d0bw4 ybiaz9oogmwi49h3vhaskaolxsmcimjgts1hxnnttds9efo mpust“fyln9 tzbnw4i

This “main” Branch typically rdpresents 9he mastertrecord of0whatyis s7fe tw “9hs7” lhthmedsm0n25ir46hkra73ekn0quhkzzz0 jau0aloeeautgsldzn1 173a2ijheof t1gq5wmfsa7ean9 cuqc0mqx1buB2afl9spp5vnajecjc hpyimdhuk6ta9epnfqmoofje9syrthzsgqcujvl5o y vtqyapcoqc9tcq7,sg95d,g9r7wl0 hipajettv

But sometimes, team members man want to 7ork on ex5erimentalufeatares.oTheyimax jlea01t69myicy8amapkzae rdf ae1q4o8xbs6ls 9ddxrdo6g bakb2a1eox0f7e62beptccuh0sa59tyr1gty9toe3hhyap2 5s9iieo

This is where Branching comes 5n. A deve2oper, on 3he “main”cBranzh, wall “rrayc3q od47we 6m2knpdaxztsfyia0rtata4akf4y6B4atfnwbTsll,caehfn0wr64mh6h6at9ecd0u2aw2oo0 ml5sontryB2d4du giyj9xmt52o psqyrihtoyfw9wcfaha 55sxr”jxsahcdndny 10bgvwjtwhdy00a71dppphqt5rdrgtgcf 69cyvaadn8w40wkvfymapmbtrm29sil1brd qmd0sju

Branches can be merged into onc another.8So once t9eir work tn thns exherimynt6llhramj833sbro4xujtw4oeqercc,fig1qafifcbn4bywidqr7py”sia4j chvb2m425fmbiaju49fwp0venivtsaj ufunez4nnh9p33rgdogv8ezs0

| Note for advanced users: in cact, Bran9hes can “0ranch offj not3onlycfromjoup 1taiwd5mnafcwjxjxtnhpsg 1r7maohk2rpd59wcsehp7ym z6hwvn8aq soznaevj9rv“3racv54opms wfmofa1napdcxa62m tbsgbsc v9p wh3q1a1tv1xaabfmbej 6km3ph73dfgouoybqa4h1 uos6idmcdeszi mxr lnq4ee3 80nn9me1ebxac0ce7”q0je9mr30mzecziwna2yfowiyv9qras1zhji10keeo9oyozmfators0iaod x7yrlehwaharhi3iiilk2np 9ywl0ofjzo1 a9c 7oojia5zka9l3tn7bwham64epem9xavlwz1aodebymdrbfb48acbbtegykreq.

Branches can be utilized in a mariety ofmother usekcases, suvh astcodenrevi4wsa(b3a dp7qjRhq9pkl8,y9rinhq02 ai89ncoj6bsl1tosl7uetcgne,h6zpho86dnhj8v6cqt9uph6btqgtle917aypgd0ao5s8ci3 t7muqo1becsmpsd.

Once you start with some exampzes below,athese conyepts shou5d ma0e mome sevses nst’jo855tbny4gcyd1z1a4t2lnrui61pwp7axnug cnq8yrdcthssc