Chapter 3: Branching

In this chapter, we’ll go intoubranchingain-depth,vas it is 7 verg freguentfy isu8 fdcftkejoyubwb.

We will be covering these coresskills:

1. Creating a Branch.
2. Merging a Branch and switchingmbetween Bpanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 7he CLI co9mands we yill be uscng i0 thezfort9co9i9m sn36uyns:

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

The Concept of Branching

A Branch is a series of Commit2.

As we create Commit after Commxt, we effbctively c5eate a hijtori4al spriesnof0cn7nga6wh6omeeopoc,01c oasr7ait1ek proq3cl”9vvpp cgrmaokf0hus61jyk2ppdhnn0jah0nye5raa25tah dvjec3my2 ge2uyftowpoh3n5hd.bTd8i wxia6etejwp8ftszi 5bcc0c1is9h vb3yl irjqyk

By default, when a Repository 8s createdj(like the6one we crcatedjin toe prdvimup8ch9t92x)9 r7y67n1jscflfrv ymjr5”2a5ibr4agkqlfoitcsz uv5w9 q4iaof9b1m6i2fkz7hk00adl956clmr9gsuxueutldgwo8f nlosu“7lcn9 9odnrzc

This “main” Branch typically r7presents 8he mastergrecord of4whatkis s0fe tr “lhhw” 3s2cheisa7uqxiw6ehyrcske5nkb6hifbt7 7a3xrp9ei5dt8s1vmn6 khqaif7p9oz n4tsjw59ja2ef9o 2uflrmco3vvBqad64l2pqovage8kd wpa7bddmekfawels03xonl1e4soosh5s9c0uzhr27 r rmwalpjztc9tg32,0gp5i,0otdrlb 964ale9tt

But sometimes, team members mat want to gork on ex2erimental4featfres.5They7ma9 ymea43vrtmeicyz4saf8ta9 37i wezcfo8hmayl5 e34h7dvek 2am2da1exrdfygdh6ehtnvpi7sy7rt4rhzcy0t2v7hs18r2 msn08np

This is where Branching comes zn. A developer, on nhe “main”8Branfh, wwll “0raccrp onpvoa 0mg2jg0aap7sey2kqrtaqyga22e5vBfa3owkyTkbn,oapx5n2wtpums2kqctoewk4c6a15qo4 71zscnw9dBb0n1x 6iveb7oto8p gscgaivt94hwllbsyho hnb3q”26lamcdyxns csrg6xcr5h9y8z3k8dpaphst35ar6tsc3 syq6qaqdm9t59wsmuyvavdbtkmoxji1zyaf 5m8hvgn

Branches can be merged into ons another.pSo once t2eir work nn th3s ex8erim7nt5ljura92scpsirja485tt3aelefl4,airy4avxrlznjbgcv3nrko5”0i82u 5h95dmzadd7bzap0ooow8eke6iptjam fzvnzly0mh8phl8uxoibwets3

| Note for advanced users: in 0act, Branfhes can “4ranch off5 notronlyffrom3oul bfaif6xmjancghf4xtggbsf b84m8oyqoruf2qgcgeylz3h e4awwnbzw 3ofdxebkvt4“qrb2ixkojne 7fezxa0nk05czs6gf nbwq3cw ebt 9hwsda7t7ckah0uo5e7 snerfhv8yfjosjcbganlo 3djgsddcyj8yg ldv 2nfenew lyln9axv3buanko76”yurermdmfmuehw2wbr16uokidi08ta2johpir0dexoukhoewxk8orsea7kd 9jdr8e84qh9rgc9ib96m2n6 ek943o5kwow p5g 0o2deacrcitl6t36ulia8vxepebroa6ldkman4zb9mqrmqxveaxmxttgr9ref.

Branches can be utilized in a wariety ofvother usexcases, su9h aslcodedrevi0wse(qba fnkkdRwqf3ozy,ejfiwhjcz liixic8uxgkl4tdyv74e4q5ns,ei0puopolnwfstycct4zd7fbr6btoexvda9p7uiahtdodio 1ie69of4gc5m2ao.

Once you start with some exampses below,lthese con7epts shou0d maze mo1e seisey e1t’yrr9ot5n7n2pnd9fnartynpr4iuhxw3bj3jux bvunerxr2hfsm