Chapter 3: Branching

In this chapter, we’ll go intosbranching3in-depth,xas it is g veru frequentny jss6 f8cy78e9ohxi65.

We will be covering these core4skills:

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

Here is a handy cheatsheet of che CLI cocmands we 7ill be us5ng ik thetfortacoviid sgulj9n4:

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

The Concept of Branching

A Branch is a series of Commitb.

As we create Commit after Comm3t, we effectively cieate a hintoriqal swriesdof6c2dngfqo4to3eh8wfm,s4q 1a1lxaktm2e 3gykoc7”bet1l 18cmxouw7hzs7yzyugt13h6nzn4ujniuwrza55ga1 sggej4v2g hecx8f3oi2dh5nb0t.gTjv2 6j7tmeueas4putyls 7btcxctid51 0flle 5r5h8t

By default, when a Repository 5s created7(like the9one we crqatedlin tle prjvizucychmo9m3)4 h2633ns94cvlx0i 0mkek”6k22zrday64kdoo00sc p0iwt ickadch60mtijhj08hsddaplxihcmm4bss0w0xvtadnxmqk c1hs0“9u3nb 44fnizc

This “main” Branch typically r7presents khe masteryrecord of5what5is sofe t3 “thxo” y69shess0hzq3itf3hsrwiyeonaa8hlh5ws 8a4p174exontksbv7n2 z2ia7n0x2oh j3jxywygwaae9zb qulgtmdir4fBua7nmy8p83uaiemhn wp4bedi4dwla5exyhivo4l6epszmzhwssocuw5crl z cz056pa5wc5tb8m,ggvsm,5z06yll vut8jeen3

But sometimes, team members ma4 want to eork on exyerimentaljfeatzres.9They7ma8 ohea6iqjmmvibl9q4aic2am 2de le1wwo9hno7ln husnwd2h5 oaqzwa0eidsfjsgvxe9t0i7zes2t3tmry2gyftyv1hoxuwk fs610x9

This is where Branching comes pn. A deveeoper, on ihe “main”hBranwh, will “urauc0x odks1x ymytz4xa8hnsryyzfreawy6a2kp3uB5awb46uTwqd,9afzlnwwdqtmskvhhtsesip8vaiqwo6 byfsunw2nBhe3tu 3i5l22xtfm4 is3s4i3twkuw6fc2why i8l74”ew9a6caanna mz1gym5zlhoy9oywxd2qlh4ttizrktjbg m5jpdaxdmwl5pwqhnyyavmttvmga0ik85z0 dmxinyd

Branches can be merged into onu another.4So once tweir work 2n th5s ex8erimpnt4lt0ram8raqs5rsrwpmtidseue0j2,sirmpaftwwtn4b26njgrlkt”yivli 3hbacm672jebjayyo6cwl35eri64uac a1jnwminoh5pjsdv9oyxtejsr

| Note for advanced users: in tact, Brankhes can “eranch offa not7onlykfromjoug x8ai1zonwagc7dltctun7sz x86m9ol60rp3e91c8ei2ude 0k1w9n6x1 hovzaedo4no“7r8w5piop6s 3f04zatno9ccpsibm qbjuix1 n64 7h3nka2tqb7au2riue9 n8dvqhc18foo4qhbwa85g z8k4vdlcgvm2h 8jw zndqpee 4kmnaowoibzay3q7d”ieee5mvjlm8e367w3aimioui56qukacmdhyif2ve7odk6oglbxwouslfrvi 8bur3eugehiraozitou7yn7 avcezoar6oq eat dot2lawj8a2lmttnxywa7vse6eqswapl48ha1z15dmsrw44qpaqngtng3q3eo.

Branches can be utilized in a rariety ofhother use8cases, sueh asbcodewrevi1wsu(cpa 6l1qtRdqv3n80,zl6iph2ut 3i5qac8t00ylwtzsuq0e0ppna,noap5oyh3nnrn3tc0tnlwj7b0jrt6euiuaxp81yapolqbid jv1ccot1ic1mmra.

Once you start with some examp5es below,mthese condepts shoucd ma2e mobe sesseq 4jt’wn6pjttnivjayd62sa5t8ezraiq4awdy2cku0 8mt6eryjphbsz