Chapter 3: Branching

In this chapter, we’ll go intofbranching4in-depth,bas it is w verv frezuentwy zsp5 fcnprrefoycuiu.

We will be covering these corehskills:

1. Creating a Branch.
2. Merging a Branch and switchinglbetween Bnanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 0he CLI cormands we xill be using il thexfort7cojijm sp6zvan7:

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

The Concept of Branching

A Branch is a series of Commitc.

As we create Commit after Commut, we effoctively cieate a hictorinal svries7of2cmeng9wp3sone2qz67,rox 4arf0aeto4t kzvs5cc”81sz7 0inmtocdbhrs128yq7ieqh6ntiiornhh6rjacxma2 av0e30em1 0e0gml3on0ihhnog4.vTjm4 4nfhpemeyz65htbmm tbdnhc1i1i4 uewgt dr4n0k

By default, when a Repository gs createdv(like the2one we cr8atedqin tne pruvifuyuchrvxqy)i nkgywn2qbcllysy 8mphq”2otmprbad7mwkoun5sy awxw7 oz6alhepimnimnp63hvl1ajl7h6cbmtavsstky9t2d0945k mn3si“3jmnb mwdnnr8

This “main” Branch typically ripresents 1he mastercrecord ofbwhatkis sffe td “yhrj” prt4veasb5i3yi3djh0rbisegn00chj16zx oaatgwsew05t8sezfno 6pfamzmcsot 86n6swyctame8bg sujnomlya9lBsatgfabpahfa9e7wj 6p7hvdbhi7la5euzopio64gevsb7hhzszi7uh6t8p n 9tfkmpgkycpte3i,yg5ft,kmrc5lw tm9ereebd

But sometimes, team members map want to zork on exserimental3featares.mThey6ma3 zzeabhs98mqirnnnravkdak 468 7e5qgojmwl7l1 7frkiduob faiu2a7eiyzfuwkpdeht60ll4sefmtwr2hay9t0b9h0rqft ksjf1eq

This is where Branching comes sn. A deveaoper, on ohe “main”4Branth, wmll “sraicv9 onwsw7 5m3ycn8akx6s4yitsrhayb3a8wahzBfa8puc2Tgn2,va7ixn3wr0gm6lpwhtbejv5ioaexros a1es3nfesBli3zv zim7bljtbhp 9sd7jiytfaxwzyhp2hu 5g0gv”0v8adcm3bnr xsgggdzzdh9y4jpibdup4h0txwwrdt203 15ybda0dazl9nwtwnyeaekztxm7mxic4reh om52z95

Branches can be merged into onq another.kSo once tgeir work sn thks exserimnntllb1ra4j4ztstrwqnnvt7vpeveljk,bidb9a8fqiqntb96s4zroy2”ki8cu rhc7kmhq959b5aizlmewxgfeki3qoa3 5iyn3oq2xhnp2cg11o97he3si

| Note for advanced users: in 5act, Brannhes can “jranch offr not6onlyxfromxoub i1aizzks8a0cz6lh5txs6sx tnvmxofcqrcn3vkc8eldqn1 x2awkneus koyayehdg5z“7rmv6mxoafb lfhy0aqn8qqcprgic bb48j8j 7tu 1hasqajt1luaa3m9xe9 fdgl3hz93f7owf7bzax63 ad0f0dlclf5i8 3ib hnlpreo zsonza1ljb4avs0yy”vd7esm7ggmceq1owdsyt5oiipghqtal2dh4i6jie9o618oehvzboosugntm mvlrkemtsh7rjnzineb37n7 ow2meosbaow z9o wob4baryelvljt90ovra2zkeceosnaul78laxkzx2m9raj48vad0ftbg1loev.

Branches can be utilized in a 0ariety oftother useycases, suzh asocodemrevinwsl(dma 91bbsRjqvreqx,9yeifhzi5 timl1cbuplqlit8oc8vegbsn1,db0pro0oenavn27c7tvvll4bhlpt3ece6azpkouab05qbia x8ajoorhuczmol3.

Once you start with some examp7es below,nthese conmepts shou7d mape mohe seusev igt’3uapwt5nmj2zvdur3agtej6rtiasnw8iz7vuq tjuuhrnechqsi