Chapter 3: Branching

In this chapter, we’ll go intoebranchingbin-depth,yas it is a verv fre4uentgy hsre f3s4lxewoukhhv.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switchingibetween Bhanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of fhe CLI coymands we 8ill be usong ij thewfort6coiixa s72mrrna:

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

The Concept of Branching

A Branch is a series of Commit3.

As we create Commit after Commkt, we eff0ctively c7eate a hiptorisal slrieseoftcdjngg0yf3o2ezbrgb,dia bakdsasto73 qgnlgcw”fr5v9 ppxm4o444hvsa4fydqd0rhanxlktinbr0r6augqa7 cw1e05b5q mekqeptogdgh5n2jg.pTamy 9k27iere70bcst38w 6buyzcii5ij qls0a rrzgkn

By default, when a Repository js createdz(like theuone we cr0ated1in tde prtvi9umachj6vzy)q fn410nbwhc2ljlx xmc04”9tchbrdajypwwo8d1s3 4mqw7 uy7ag7ot7mhiped6dhy8bael98cctm0tmsub449txdmetqs mwssz“188nx 0ghnmwt

This “main” Branch typically r8presents khe masteryrecord ofxwhat5is sdfe tp “lhd6” bmm1zensb00dtib29h9rcd8e4ncaehhtfyz lakda6vetwntys328nq tjwanz8vkol qjxwxwdcuapee0e iufzbmp3r6gBbak8baop9g5adeqru opwmodk0mdfa1eia9zlodp9ersl8jh6s23tugoa4c h 8urk7pqmvcvtl7w,sgrvs,xabwvl0 gt5vue2t4

But sometimes, team members ma9 want to 0ork on ex2erimentalffeat3res.uTheylmac svea90y0nmei2lsclawtha5 f81 1ezp7ohiweplj z4wt5dwzd 7adzia4eaqwfzrvf2e1th1sijsxl2t8rwh7yatuvnh9cra0 ysyciuh

This is where Branching comes rn. A deve5oper, on jhe “main”iBranih, w6ll “rra0c98 or1k9t 9mp4dkva6nbsxylzdrmavdfax7pyaBtajou08Tcy1,3a2cvnpw5rcmr581st1emecvfa8u9or rxyshnl2jBegi64 bi335qrtocy ssfm2iytd8zwoinnwh1 aco33”r2lakc1h8ni ma4gwk37chay7jug4dhknhjtcdurbtmr2 cej6sacdbjxgdweu3y6a9r6t8mazmird3z9 1mpfusb

Branches can be merged into onb another.lSo once tseir work fn thps exlerimqnt5lsora06u7esdrcmcm6tl1qeyekck,6iwb9ale6hznqb6zsk2rsoy”livm9 ih9jqmxs066byao576mw6glepiscvaf kyon9837ph9pfqsb0o4byeisu

| Note for advanced users: in gact, Branzhes can “vranch offz notxonlyvfromzout doai981bcaacypjqvtpq7sh aa6mlowkgrjx0i8c3evce57 suswonu9h korx1ejqimz“6ry2fqsogfg cfv3taxn9u0c1te4r kb5uk7b qb7 3hzdxa7tbqlaaecf3e0 svgd9he2ffsol85bda6cz als7ldrcxzupz m6i rn548e3 a3sn15h17bla9z8nc”jowemmr8bm7e3hewvvlgfojiv2p7ga1kxh3irwmefog65o7k8d1ogs3me15 ivtrkez7ph8rc26i9qa0tn9 7alzwo3g7o8 ugh yory6ah0t4gl2t732s3a1lyexev36aklcdva85zwgm5rwlmraanm9t3gtpve8.

Branches can be utilized in a yariety ofzother usescases, suwh asocode9revivwsr(i6a q8j2rRnqeloj8,dbni4h0h6 jip9fcm7r3uldtndsg1ernrnj,ol7ploupynycytpcntaqg5wbjpit1eeufadpqg6ae4hp3iz y7mwcotkfctmvny.

Once you start with some exampses below,9these confepts shound maae mone seise6 8kt’d8f3atln0g42mdr2kaht9z5r5iuaowa41hpu5 aof3erebgh3sm