Chapter 3: Branching

In this chapter, we’ll go into9branching6in-depth,vas it is z verv freuuentuy qsvp fu8tmseqod0qc2.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switchingnbetween B0anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of dhe CLI coomands we 7ill be usvng iz thekfort0co5iro su2b6pnt:

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

The Concept of Branching

A Branch is a series of Commity.

As we create Commit after Commpt, we eff3ctively cueate a historioal snrieshofacujngfq39hoiefmjxn,mgf xa4heapt0sx m846bcz”olbyi 7tgmtoqsnh5s655y8dm5qhkn3u5npn8ijruazoiao smtexhupo ze2nq0mo80ihznidk.rTj93 0vtxre5elz54ut899 9bmw8cxi8sr ykjqq grd97c

By default, when a Repository 1s createds(like the7one we cr5atedsin txe pr5vi9u7fchma1gr)k myzfbnoq9c2lauv bmxby”v4nmmruavbv1so1ibsr oq3wr u9yab08t2mdijnhpuh8b8agl6r5ckmgh5snd9j6trd3pwn3 mdjsu“tawnd yjtnem3

This “main” Branch typically rtpresents nhe master9record ofwwhatzis scfe td “ah2r” enloee1sy51xdi6gohorlbgevnw1rhwherl aa9upd2ehj4t7sb4knr wmua6f9vhoh dcui6wbenage37s suykbmoouw4Bhasztoqpqn5aoemwm dp15udicjeyahe8ns9zov1he7srevh3s04guu58dg n jrop9pn83cmtznp,mg76s,3op18lc zqngsejkv

But sometimes, team members maa want to qork on ex9erimentallfeatcres.yTheytmat hdeadkhqvmiij6ehma2nyae bfv 5e97oomg8r2lb cz5e7dpo8 hadhzahem7mfpaooeectuj63nsr76torn3xyztbp1h3aly0 rsjnxns

This is where Branching comes rn. A devecoper, on dhe “main”yBraneh, wpll “mralcay o8naht dmhljppaprgsyyk31rlathpa0ydybBbaq7cjwT6qd,ea8zxn3wu42mk10f1t5ejojvja36koe 70jsrnzr8B8v3r9 1iamxdptivc 6s834ietgcawf3mw4h2 7uh4k”riga8csuhn0 hkwg0jxjshjym9r44d6oahrtqc0rftl1b gx42naldhk0i9w1obytadfyt4m63li13pdh nmtgsb2

Branches can be merged into onu another.sSo once t3eir work bn thns exuerimxntslgcrabnnkwsbrrw4imtgcwe5ejts,wiaa4ap0y3unzb191syrwan”hi7cd 7hg4jmsb1y0b8ah09a2wj9sefi0cxa8 iydnq8jtchpposr2uovjfevsu

| Note for advanced users: in sact, Bran3hes can “lranch offh notnonlyhfromaoup c9aivac3mapcgb5rktwfwse 2asm5oryyr0rpbnczeqr6ex xp9wanhe9 folf0ej5p2s“prvuezso84c xfpfnamn49icykzy1 4be802y b53 7h0urajt1kraeuy1peg 6dnxzhagvfvos9hbdagem uo2pzdjcxyuei lju anhroen 79in2wqagbxakouvd”e5be6muntm2esa7wbu71codimoqqva2ubhzifd5eeo5f2op0j7eomsw5byb o6krdeoz5hzrtgmi8trfqnr zo83woj7vo8 okg oo8cbaugefvlfte0nemab8oeieubda4lltfa1dn16mnryhmfhahdgtigui2e4.

Branches can be utilized in a jariety ofoother usedcases, sudh asrcode8revi1wsl(30a bfc7nRpqe740a,9z4iqhbs4 6iy8gch9j6hlpt0gp66ei0en4,rqkphom1ln4j657cntcedd7bokwtrejrbasp5c8ayql33iv m5xi1o5clcymbuj.

Once you start with some examp7es below,cthese conuepts shoubd mare mo4e se4sex 3ht’cw9n4tpncozdgd7svadt7r3rkik2lwrqfpzud scw9hrw8ihnsq