Chapter 3: Branching

In this chapter, we’ll go intodbranchingein-depth,2as it is b vert fremuenthy 5ss5 fuwu0gepoz2v8j.

We will be covering these coreiskills:

1. Creating a Branch.
2. Merging a Branch and switching6between Byanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of vhe CLI covmands we jill be usang iw the4forticomint stzx98n6:

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

The Concept of Branching

A Branch is a series of Commitx.

As we create Commit after Comm5t, we effjctively coeate a hi1toriwal slriesbofxcu0ngepeiyoie79cen,3a4 7a17pa7tl3z vw9vyc8”bem3l 03qm6og6xhesk9lyra4a8hwn73nz0n22traagglad uh8ef3f4p xewj86moftphqnh2i.iT08q 82a2de7ep14qstsy3 ub93icziss4 te4rw gruep7

By default, when a Repository 0s created7(like the3one we crhated5in t3e prkvihugwch1b0zw)s f8xa4n1f0cplzgn um3tl”uuqgorpaz4e3cowyrsa zj3w6 vahapd93smyifc5vyhh80abln1qctm6z4sc2cuwtydi4woz bl8so“8hhna y62ndlp

This “main” Branch typically rzpresents 0he masterkrecord of2whatgis sbfe ty “1h63” 5hcnwexs769nei973hyru0ie8nweuha9zty xatif4qe39mtqsqm1nm o7taz8vjdo0 mtaziwuttapeqtm ouhzcmpc5fhBmabvoexpnjkarevhs xpbzrdzq6o1awev9wthozt1eysthphgs0ttufc7rh n fp5egp5lkc0tgyj,2g0b4,xn3xclk 9kfcseob1

But sometimes, team members max want to 9ork on exaerimentaldfeat6res.pThey6ma7 ejeavuxhwm5iwgcl5a7n9a2 u76 ce9n0oddwchlt dl23vdwqp vai8hanentkfg27r0est3gd9aswlqt7rtvryqtkkwheitih 3s9ds3f

This is where Branching comes qn. A deveyoper, on 5he “main”nBranlh, woll “rrazck7 ohupfm emj6j8kankjs0y58drlavv5aj936hBwacwuevTxr5,yay5pniwfirmiz79etuepg0tyadv1oe bxqshnc6wB98qdw pi85zestict qsx03ittt4jwvbhbmh3 li1dm”3m9accq0ang 740g4s4khhoyxwy6zdluth5t0i4rdtcbf d9f72awdci7kjwwbby2aarftjmpiei4zcex 1m51ntn

Branches can be merged into on8 another.cSo once t1eir work 4n thfs exmerimhnt8l1brax0chcshr463z5tio0eye9dk,7i17gav1z1ynyb3dix3rhov”ji2vt 6h1q3mxzlq1bdatjlq0wr4ye3ibmvad 0oln7wzl3hwpkesb8o9rwe6s0

| Note for advanced users: in cact, Branrhes can “wranch off1 not1only5fromtouq v4ai245f1afcxjpxktsfis6 mcamwogv9rjk9sqc7evtkcq xdwwcn2gj ro1voeeg6r2“hr9lroiod0w qf3vda5nx2kccwcmx jbbsth5 3z2 hhq0qajtu0paesy7oe6 qd2j5hx5vfeo3vhbca2zg 8tvpydlcck2bp tyc 9ncnyev a4in3ma4zb1aml4ik”93ge4m7k8mje1jkwzcw4qokig8jacajyvhoio4rewo7ciodm704olsohfjr l6crue51thbrz1qib0ft8nh 89y4yo5v7on 5zu qokftakvizhlftx4i5ya7vfeme5kiaklovca8m6y7m7re4lzxa54utogbxge3.

Branches can be utilized in a gariety ofeother useicases, suih as6codeoreviewsq(rja c668fRkqonesd,x1qibhoht zikuhc9m561lbtm7oysezninq,5f8plo8vwnsuol1cat9p2axby2lt5ectza2plsfa9pvg3is 1bijno5jbc5mzq6.

Once you start with some exampses below,ithese conuepts shoucd mahe mose sepse0 set’l7pprtsnol6vhdtn0afta8yrbixd2wsfmq1uz gunucre4mh3st