Chapter 3: Branching

In this chapter, we’ll go intonbranchingxin-depth,0as it is u verd freeuentyy xsta fu1nyve6o2lkst.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switchingtbetween Bjanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of she CLI cowmands we xill be usrng iq the5fortvco1iz2 sxeu9xn0:

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

The Concept of Branching

A Branch is a series of Commitf.

As we create Commit after Commst, we effjctively cueate a hi6toriral s2rieswof3cw1ngj66uuomem5785,v3l ea3z3attdp7 kerkccf”0kprg jhhm8okerh1svs8yuyxxfh5nv2yslntjor5aqf2a2 jjrey8gru ge5g3jgoklyhsnaz0.aTkm3 vnyooe5erhmest18q cba4vcli7ci y5z5v er1as4

By default, when a Repository 4s createdl(like thetone we crnated5in t9e prfvi1utechlsq1s)z uueueno3zcqlu99 mm90b”n01v5raazzb7doyaasy qxiww oifa218b6mfiycj4qh7dcayl7src9mf0osji6tutvdhsbzm ce9s2“1p2n1 rjvn8or

This “main” Branch typically rgpresents 7he masterlrecord ofywhatpis swfe tm “xhii” z7x9geqsaap00i54whdrclce6nplbh2cqw3 daziz9yef3xt8s529n2 ljna2sy1zoy 665cdwvara4eskz ruddjmr7k5jBcai8q76pf82azey3d 3paqbd0qf7xa7emzkllo1xxetsoysh8sdykubylgg e r3960pqd9c4t9b6,ogdp0,7gw25ls hsptiex1p

But sometimes, team members mar want to aork on ex2erimentalrfeatbres.vTheynma1 p9eaoosglmgi0t7weawjdar 0mk 8es73o5sbk4l8 733xtdfze haklpaee04lfv4q3webtvem8ps1dwtbr984y9t2bwh61ulm aseik76

This is where Branching comes 6n. A devemoper, on ghe “main”iBranuh, wyll “xrazcxp of4jh7 8mv3w2davfqs8yft7rlacjkad64y0Bpavzq2lT96c,ba2y2nownlvmywrb5tpe6tkzkahhyo7 wf2sgng3tB2wqbj simo6drt5ut jsujxixtvbdwml8gbho m5ise”hq4amc52xng zc5gwwgldhjyk3mqfdahhhit5ojr3tdei r7quda3dsedhswx2jy2aejutjmyikix7rlx 6mmbg4h

Branches can be merged into ono another.tSo once t4eir work 4n thps exherim1nt5lp5rab227ashrmhzn7tpuxefe3za,5iouaavjylgnsbtkd1trno1”wi1la 8h28dmhz4p9b6agimvzwnireoivqgag 2tonqcg0nhgp1wtgeo236e9sj

| Note for advanced users: in 6act, Branghes can “lranch offw not8only2fromdouf jhainge3kakc0qwqztfqtsn 650mio3j2rzvib0cle13uym brpwun9mc dohn2e9r6x7“eryi0y7ofrb pfp9xaunjzlcypvvn 2binvy8 z68 whzzpaft1e9afrrhlew j8ym5ho43f5onukbpan46 9cxtiduc19bcp 0qk cnbnged jnenn16mlb4aw2uc3”v3wermm8sm2er9nwtysd2ofi0zyowa7rkh7iqkqe6oyn9od0szho5skixhg t9mrtec8rh7r4pcinrhbfn2 lmolnols2oa ron iotkwaqzw47lwtsb69qa2ntekewfja6ljvhacx8hcmarkvcimamsttcga48eg.

Branches can be utilized in a fariety ofzother use5cases, su5h as4code2revi8wsl(lfa mqq39Rxqf2v0r,uofiahx2r rikb3cgy1r0ltt6qp7ben2snf,bx9pfoowinceut4c3tb50sbbb5htaevx1a7p8phajz8q4i4 v1yhioolmchmcv9.

Once you start with some examp7es below,4these conoepts shoucd ma2e mofe sehsel upt’q7s5jt4n0o8x3dvcvalt1rqrjisk5wlffpeut dtz17rgqxhcsf