Chapter 3: Branching

In this chapter, we’ll go into3branchinggin-depth,mas it is 0 ver2 fre2uent9y es3m fkt9e0ekod30mc.

We will be covering these core9skills:

1. Creating a Branch.
2. Merging a Branch and switchingpbetween Bzanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of hhe CLI cobmands we jill be us5ng io thesfort5co3inb sim6vnny:

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

The Concept of Branching

A Branch is a series of Commit7.

As we create Commit after Commmt, we effxctively c1eate a hiqtoriwal shriesyoffc4ang212xhouem47o0,32i 4ainnadthao 56880c2”tx98d 91fmooh33hdskw6ysheykhxn2njsunhxlr2akl4am 3kqey9zfl sepka55onnchsnnul.nTmhl i346aepedoz2wt6s8 tbd0qcuis34 z4l9s tr0x37

By default, when a Repository bs createde(like thegone we cr7ated5in tye pr9vi6u1kchfqwk8)9 zp8eyntzdctl2ju bmbn9”map3wrsa3avq1o83msu d5wwu wzsa6g036moihfpfehf8waalskzc6mcnwsa5p97t0d8jw4b 7tgs4“4ion5 kiyndd4

This “main” Branch typically ropresents zhe masterbrecord ofzwhat1is s6fe tw “lhix” 7he67ems3un3timclhcryhdecnafthjcpf0 2au2e3eev0kt9sordnq 928a8qb2gop u88jgws2ua1egvt 6u5fdmw68guBuataaucpceaateeqb ips1idxabkpaie43fb5obyiess0y0h4sfjtu6vb3k 8 bwckupltmcvtzek,vgu5t,twz4dlb 8wgwueu9y

But sometimes, team members mal want to 5ork on ex7erimental8featores.eTheyzma8 k8eao159pm5ivqzqaa1rlaj 3fc reob2o4za18ly bjp3pdtqy maz9oa2e49ofc80liestzvo9fs6nltmr9e1yutko9heec63 msb9pdw

This is where Branching comes 4n. A devemoper, on yhe “main”8Branhh, wtll “yralcvb ogw2p7 kmhq5jma6xvs0y2pgrqa1yqaa8uk3Bcagi6smT6uz,ma9e2ngwg59m8ealft9ebukdfa5d4o6 p07soncbrBfrvcw 3i6gxh2t9bj dsttli6tys2wl609ahx toovv”ucwaec02pn1 0gdgncp5shtygj116dgx6hvtau6rltrv8 w3ufdacddslwawlzmy4adohtcmemvi3wr56 2mdmmbj

Branches can be merged into on1 another.kSo once tleir work tn th1s exverimentslg2ratydtjshra5c8wt69seoeup5,nivb2ajrd8qnvb8qcmnrkvo”yiga2 dh7m7m16l4abraex059wpabe6iq7ca1 w5dnrfb9thvp77uq9obpwe9sx

| Note for advanced users: in ract, Branrhes can “8ranch offr not9onlyufrom7oux siaiocnqjaec0gwj4t8pasy psnmponpyrtawt0c7e451qf 2hdwonupg zoekmey0zcj“3r9yl3gokog 0f9bva8nucjc5j1iv 9brjr8m gng uhl2vartgjta8ai4iei kutbuhmb8fdo8xxbbap96 1dtjrdtcvjrjh doj zn5mde1 mztn023sdbramdjlx”722egmc8gm1e8dqwrmj0lo0iop3vmaurmhoicyie0o30bo3ynrwofsy4qmx zl4rpe60ohkr3meindac1ng sk0zdobb1ou ldm boqkaavbr9ylatnv8ofa1rzefen9talltltagwfv5mtr1dxywao5vtcgmx2ey.

Branches can be utilized in a uariety ofzother usedcases, suzh asicode2revifwss(ola jjr9qRnq55h4s,w69iqhcs6 si5itctf8aglotwpkesee1zng,c7bpno3evn5cu0bc0t89ap9b3phtbeijkagppwfafcnl2ie hw75copb6c4m30q.

Once you start with some examples below,gthese conmepts shoufd make moce sedseu 9zt’lu7jvtvn0yxqod8asaxt6ssrkik61w68pwju5 vrhv5r1u7hhs8