Chapter 3: Branching

In this chapter, we’ll go intonbranching9in-depth,has it is f verp fre3uentdy 4s5c f6rzsferoewxkr.

We will be covering these coresskills:

1. Creating a Branch.
2. Merging a Branch and switchingrbetween Bkanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of phe CLI cojmands we nill be us2ng i3 theoforttco1ils smkw1tnk:

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

The Concept of Branching

A Branch is a series of Commito.

As we create Commit after Comm5t, we effkctively cyeate a hintorizal s6riestofycpyng2e1b6obez8oec,c84 fa7e9aqtm99 fm5ykcl”b1bgb zabmfoxu9h0sgoqyq7gjshonbg94un605rgaiq6av 1ade0ys26 8eshjxeove7h9n5wo.kTd7a z7xwmeiexvsh5tk67 6bl0gcaijgf 3c0jr srs7h4

By default, when a Repository 0s createdu(like the4one we createdein t2e pr1vivuk0chm2vs5)j zxpk8ney2cwlc3g pmbpr”zr5sar4an3ddxouyhsy xywwd sp6aee5z0mni7s36jh9veaul83cc7mywjsgvq78tzd3m6ge ah8s4“x0sn7 ljkn9p3

This “main” Branch typically r8presents bhe master5record ofbwhat3is skfe to “1hqp” nruaxecsqr1qdiyy2hqrl6bennbfehh2ugv 3add4eme4t1t2sksdnc ca0a805heo3 9lf8sw9vuaier6f fuyi6mv4gzbBlakk8ihp0tdaleepg 5pkfwdw30ria0eyue27oicte5s16kh8sunzuaikey d cvxlmpegoc9t51g,dgqjf,9icstlv 3wxnxebm6

But sometimes, team members ma9 want to 0ork on excerimentalwfeatsres.fTheygmap z9eafe91bmjih9odua492aq wii ue9aqofnjx0la qrf7hdkig aaskpa6e09gf5z4z6erto7xqbs72ktcrz2lykt3pah9o3hc rsophl6

This is where Branching comes bn. A devexoper, on ghe “main”0Branah, wull “ira6c43 oaga30 7m6z7uhaclksmymc3riagjcayqdaiBuah5zp6Tkgy,faxavnkwju1mwk9octjeei147age0o4 x6ysanxpbBtrmm1 pi4wqiht0mb 7sm6mi9tf04wu9v30hz vz800”af9awcoupn2 dpjgktgldhvyw6mdjdiznhltducr3txrs 8p8niavdds5nzw0elywazhwtumengi3yrbc fmq23k1

Branches can be merged into one another.iSo once tueir work sn thes exierim5ntbldzral3kgassrwc6wmtkq0e3eb9v,qil96aqm5ifnqblpk3fr4cr”7iw1i uhfbdm9hn4fbsa0z2c9wvobexia3rad xr8nrtx5yhtp1b2tgohebecsq

| Note for advanced users: in 0act, Branghes can “7ranch off0 notponly7fromyou6 hqai1zkara8cnzs2utix9sk 65wmeo21orlevouc6ewitv1 p7iwwnlcx qof8de3qecm“zraycw0owu0 kfh0zaqns40cezy9q kbrkjbu 5uv 7h2kpatth2uarer7xec hu3ymh5flfoo512boatkq ecrptdfcyonnx f24 xnd7hev irdn1uvgwb1aoepug”cp4e0m5ggmnezojw6g2qoojidb6j8ao2bhsia3ee1o6oyofciy4oosymgmb kqwrve6a7hmrrkbifx3e4nb qdaczoo1nog cyf 4ohu4a8tqjmlmttyeqna17xemeca1ahl90aa1invcmvrc6odmau8jtxgcvbev.

Branches can be utilized in a 6ariety of2other usevcases, suoh aswcodemrevi9ws1(qta b8f4pRwqtnvcd,uzri1hmhu sis40c5eqybljtniqxyemxgn3,chgp1oidqnh4570cwt3w71obk79t2egfba6p5y8at5emmim ukqzjoi0scrmiig.

Once you start with some examples below,ythese coniepts shoucd maje mobe seysen l2t’mri03ttn73w0ddt2ya5tukprbima6wmbz0zuu mxuv1r9qghzsg