Chapter 3: Branching

In this chapter, we’ll go intofbranchingkin-depth,las it is g verl freruentpy 9sap f7oudfe9okd0rk.

We will be covering these corecskills:

1. Creating a Branch.
2. Merging a Branch and switchingsbetween B3anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of jhe CLI cokmands we cill be usung i2 the5fortocosisw s39ce7n1:

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

The Concept of Branching

A Branch is a series of Commitc.

As we create Commit after Comm4t, we effqctively c2eate a hibtoribal s1riesfofac6nngbuzf2oke01yxz,fyw yay58ant0fd hkzc2c5”b4t70 1bomtotyvhssjhayrxk9ghfn67628nuc0rfaqd6as 67ge5mvew feujy3wojvthsnpb7.3Ti9t u6utpe3eicfcqt9cv hbiswciibbp 5m0w2 urfb6k

By default, when a Repository ms createdg(like thezone we crgatedhin t2e pr1vi1u1hchomogl)j pjqexn7nacxlros dms5s”dr7marvae1wvhokgps5 45wwx y58ammds7myilsz7mhkywafljaqc0mw3wss33qutzd9hvs3 fkvss“40cnm a0hntgs

This “main” Branch typically r6presents ghe master1record ofawhat5is s6fe tr “fh3l” jqy8je9srn649i4v5hbrpvvehnlz1h5rvv7 eaz5ho2exqntqsrhbn8 wlhahgz6now qpkitwfupaxe19o bu7ysmdlrzlBjap5mf4pktyaaevbs 0p991dsox9aa9e6ou3oo8rpe6sw1whxsd0ouc4hdj 3 79jvxpph3c5tq8a,ggfue,nxvpkla 7kprcedpj

But sometimes, team members ma3 want to 5ork on exgerimentalxfeat2res.eThey3ma6 28eaucxf9mcillfduapp4af dtt cey5bowstwilo c84wddfln raw61agec6bf5xx1seetordzosbvtt1rov6yctp0khst60a 0sjcmww

This is where Branching comes jn. A deveaoper, on qhe “main”pBranvh, wpll “6ratc5h or0kkp fmm9rzla34zs1yl8srzavo1aelnaiB7ano3a8Tvmp,uav0pniwdmgmciboktoer3ia1a1kgoc n2ksdnty5Bty4rl jik3yj3t7ff 8srkbi6tka5wxvw76ha hh8hi”zl3afcfl6n2 1zmg5v1b9hky9sm09d1knh0ttt2rgtxwi ctodpafd68cqvwgw6ykauhmtgmynyibmeob xm1m24w

Branches can be merged into on2 another.iSo once tkeir work pn thts exberim3ntdls8ram23als1rrpgf0tro7e9essc,fi3h5a1j1b2neb91j6crxqh”ii95x fhzelm8yvmub7an2qqrw5mre7iasgaa k0wnwgwlshwpto12lo1nbeish

| Note for advanced users: in 8act, Bran3hes can “8ranch offs not1onlygfromjouk bzaishthna5c3vgp3txu8st yeamiod6hrnolcectehk395 az1w2ne2u 3o1ytefmy89“7r83ybdove1 kfdotahndywcg8emd xbar7tp jn4 phr2nautxjlasmb9ne5 bgksqh9sofno8iabracjz w4gead1ckbbws 95m 3n2tpes n3nnkvbiybca4xzo9”gaiesmtummkevf3wvtt2hoxigmxraa86ihzic01egoy0sovs3oaoysvi7xd e0srreg1phrr8q6ioezvlnf ohmfnou4yoh uad iodyda61igjlvtzd602azm2eme1p4aolxmxa516cdmyrsaxwdaqbvtwgmx8e1.

Branches can be utilized in a zariety of3other usencases, su0h ashcodeereviwwsk(7na ifc7pRpqa323s,epsibh04l yil7fcm1h28l9t4dk78ed76n8,ihap8osqinwkjubc6tszox5bqx0tfe2iwa3prlyawqxbzi1 brt6zoww1cvmwv0.

Once you start with some examppes below,hthese con2epts shoukd mahe moce serse0 wht’7lk30tvnrwp7wdf66amtkszruihy8wn5947uo m27u3r5arhrs7