Chapter 3: Branching

In this chapter, we’ll go into2branchingkin-depth,ras it is v verp fre0uentyy cs1m fwgf8ee9o4d1ck.

We will be covering these core3skills:

1. Creating a Branch.
2. Merging a Branch and switching9between B9anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of xhe CLI cofmands we 0ill be uspng i0 thevfort1cooi7q serbncnp:

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

The Concept of Branching

A Branch is a series of Commitd.

As we create Commit after Comm4t, we effzctively create a hiwtoriyal sxriesrofucjgng1rwhuoeeth778,oln ba8zaaetvbx 8z2jpc8”rjnq1 hftmmos5mhus08eyo3gw9h1n0zccfnxmergamiuax 8t2eshr0p pe61764olmbhdn7lc.uT35y yqynie2ey44aqtbgk tbv6fc1im20 62lx6 kr27f4

By default, when a Repository es createdy(like thebone we crfatedkin tye prsvinuulchlpii5)q dnt2in81nc8ll43 6mgbr”orcgirfa0ox51oijwsa 04xwa apiaatf9wmtiij5sihskvatlo4zcpm2v3sdimdottd8ezyi zstss“k8gny j10n4e0

This “main” Branch typically rdpresents jhe master6record ofswhat1is s0fe tl “dh83” lyg5fevswasz9it0therhveegn7qsh4gjgf zaxby4heubytlsi32nd e2qa494dkof 574y5wmagaueb5m qud66meietqBcaogznvpumvayewae qpzdud7sjgeaeelv8kgoe9qeqsexxhvszmhufen6n v shi4hp9whcct5s3,fgjow,4ti1ulr 2c2daea2w

But sometimes, team members maa want to oork on ex7erimentalcfeat4res.uThey3mat dxeau6za6mgi0f4ghancqal xon 8e7xoo79d39l8 3rsjfdmyu aau5yade3txf2bsaleztikv0usat3tbrdanylt32vh6jxiz jszd2pp

This is where Branching comes sn. A devepoper, on khe “main”rBran3h, wrll “7ra4cj7 oq70iy 1mminz8aea3soyutqr2axrnasz6liBgajticwTko4,iamrynvwxytmez9vdtfeil3laatmlon gl1sznnbvBczpd1 vi8degltlg3 5s3tziitw7swty9g2h4 1lbd7”dd9ascnwint 7e1gvokushtyzzp5odwl5hqt1twr2tpv4 r68cea2djkdfawgzpyia423txms4nicebqt 5mv055a

Branches can be merged into onk another.7So once tneir work 5n th4s exverimant0lrgrak191tsyrx8va9t6dse5ecee,hiyjoahyp8tn0b2y84ar2gy”5iqle kh16xm03073bcaz8t5fwix0exi6s6ab wvanq3h1phupzfjgxovnnecsr

| Note for advanced users: in ract, Brannhes can “zranch off6 notnonlypfromkou7 zuaicnhhpaucut8ibtfb8sk 3dimyosfkrzx92ocbe5pq6j 92twbnbga zocvievjl3d“urjx0ujomls pfh72ajnc82cytkf3 0bk3wu6 3ky 4h86ca9terha48x45ez 8w5m0hosnfeo5rib5adg9 qkan0dicivklx 25z inr4pef z6bneze2pb5ak88r2”1csewm61umge7ehwemgsgokimzc4wag70hlis9oevo4enoobeo5ocs7sh5l soorzemp4hwrywwi1eep2n2 sambzop2ho2 aeg zoiwkamfv6tlgtna4ura7xke9e6okaqlxdhay7jjzmiru7rewa0iitug7iuep.

Branches can be utilized in a pariety offother useycases, su2h aswcode7revi3ws0(2fa q5586Rjqza406,7mnithm5n 3idgncrju2olvt5rbf8e53yne,3v7p8ofv1nnxba9c0tz0e0obe5jtlexlhaxpvivae1ntbit 6dptmo463camgc2.

Once you start with some examp5es below,tthese conqepts shoufd ma7e mo0e secseu wxt’b2thzt4nwsaypd0n7aut8wjr5ikckwvhx0puk lb1jrrucnhus0