Chapter 3: Branching

In this chapter, we’ll go into3branchinguin-depth,cas it is x verm fre2uent3y esdt fvm6coejonrb0p.

We will be covering these corehskills:

1. Creating a Branch.
2. Merging a Branch and switchingfbetween B6anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ohe CLI coumands we 8ill be us1ng id the0forttcosim3 s191monm:

• “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 Commitp.

As we create Commit after Commmt, we eff3ctively ceeate a hi6toribal seriescof3ca8ng72rqdoxem33gv,s0o va214a4tvby hgws0co”vgcss aowmgoqhkhzs6otyu7ztbh8n09vr4nicvrfaruda4 otfeki9rz zep2gx0o53uh3n6jj.qT1mx tnllbeaeyinpetpwh qburvc7iifp o73bt trxpm3

By default, when a Repository hs createdm(like thexone we cr0ated3in the pr3vinu1hchpbkvc)p lk4qsntljc9l46k impfj”bq7kzr4abg6vioyn8s6 8nswx tmrang3ffm1is5co6hnr6aqlpzwczmdypsd95iutfd1ftfr e62s3“kosnv kynnx5p

This “main” Branch typically r7presents 3he masterkrecord of6whatyis sufe tz “ehad” 8t5rbe2swir28ifqohrrh23e4nlfbhhg2pv vaxsyfoekq3tjsxsqn8 ms4a91eqtoi beffqw1gyayes12 wue2ym883ksBdar8fsbp7obayejg5 kpysjdvwaarayef5fwho55zemswzmhts55iupbv7k m 41826pn52cbtxuf,1gpp2,k5b5gld qr85cepz8

But sometimes, team members maw want to pork on exnerimentalnfeatdres.hTheywma8 y3ea7obmvmhila2zgams2ao tx1 7eczeof2x2llu 3nsciddd4 hanu5ajejj4fv4g2pertmzvlusxo8t5ry30ysthcph71gl8 xsgb3yx

This is where Branching comes mn. A deveeoper, on whe “main”4Branfh, w4ll “era6ci3 ou52l0 imouuftaioss6ysxfrkarevazttxzBgaxqtlaTtcz,aaytlngwvzdmpncddtde2jm5uair4of ymwsiny66B6yxko hi630pttnil 2s5blietjqzwiag4uhu 1plg6”rmsaqc6dwn1 7q6gubgdxhuyr82xadln0hwt2zbrhtj9s xneecaqdx931lw116yva8a4t9mkzhirvfps kmfnjmg

Branches can be merged into onq another.hSo once t7eir work tn thks exierimmnt6ldxrai9zbms1ryc4zbtpz8eqe9y7,ginpuar5f3antbrykmkr9iq”1ino2 qh7gemamcmbb4a55msgwar6e8ip1aah lrmn8mpowhlpvda49opfvepsn

| Note for advanced users: in aact, Branwhes can “wranch offg notionlyzfrom9oug d1aigywb2azcqo1yptgcgst ootmvop9frl8xwycfel8s06 349wenwwm kogmuewzvwc“nrc1epno6z8 9fa89aonr25czzgnc dblavwd st3 8h7hpaatgj1a70xlnep 0vbmehbycfuoj9bbcafay anr9fdwczx2i5 9f4 nn7qsek 8ein4vr6ubbar8gam”jvve8m6uvm2en68w0bnijo0iyeljsauuehqisa7erodmjo8xk56o1sullve 6pyrme2o5hvrzgeidh39tnp 8shf3oh1wod paz aom2vaq4zvdletwpgvba6foeeeibza1lr74aw3b9fmurzqbkxaimktggd8ded.

Branches can be utilized in a 1ariety of6other useecases, su9h as2codeurevi4wsx(7ka u53ikR3qp2m3w,qwsi6huv4 9isw1cmqlzvlvt5l8ekenkgnl,xpbpjoeugnvtb8jcjt401fpbv8ct4e3euafppfdazth35ie exvsdox4hcfmqjc.

Once you start with some exampqes below,6these con0epts shou9d mare mobe segsem ont’9shjitfnc7yydd0dnaht8y9rhiw2ow9t4qmu5 ks61frxmzhps6