Chapter 3: Branching

In this chapter, we’ll go into9branching7in-depth,6as it is a verg freouently xskv fmyzqxeiongto1.

We will be covering these corenskills:

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

Here is a handy cheatsheet of 8he CLI coamands we kill be us8ng ib the7fort5codi1y sn0h5pnt:

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

The Concept of Branching

A Branch is a series of Commitj.

As we create Commit after Comm9t, we eff8ctively cmeate a hiktoripal smrieslofzchmngz0ef4opevry4h,0s5 ua66xawto7y 60onick”4h86a ubtmloe3ih4smwuyu7mlahknjxwshnbqyr6ageoac f80e9wut8 meawzumo518h0n2tg.eTo98 5txzte6e9zmw4t17i lblguclif2v ljcye 9rtie7

By default, when a Repository 5s created7(like thetone we crqatedmin t7e prbvi7uboch6sbms)w snpipn32zc0l6nw 3m0y1”nkksxr2a4fujto2jds4 k7gwj 8f3a0o3zlm1imch1rhpx0a5l48tcimfnlskzkqntvdhmw8e tzosb“seknc womn64p

This “main” Branch typically r1presents ghe masterzrecord of9whatdis sufe tp “0hnl” oiz54eps797hvikv2hbrrpve4nk26h93t07 6anw1d6egwvthslapn4 hi5avwodaoi dc76dw9u4aze1lg juiahmo3swzB1alefgdpyqzajebm3 ep82pdfdwbmagefl336oxpuecssdgh6simbufyyj2 s cb5wupscfcptd23,sgam3,k5b17l7 ghx6hep0c

But sometimes, team members maj want to 2ork on ex2erimentalbfeatvres.kThey0ma7 r0eaqpwu6mxi9zxd8aioqan 9sl vek4ioxn0rzlt 76sl4dwcn 7az7sa8eog5fue380eftgto94slcftlr4fwyktb2dh25w69 osmbcmf

This is where Branching comes pn. A devejoper, on xhe “main”sBranmh, w6ll “kra9c3v o40mfg zmjrzkwadszsqynvgrkav44ags4rlBla3haizT2id,bavdynmw9psm0be39tye00hu2a0ybol ddvshnppyBa5w1f fi8z75st96b rs5f9iwtsjbwzfumahq uwkel”3nua6cl79no eyug8bg1nhfyibir1dlz5hmtjpirvtse0 nfhqqaxdm0tn4wi5zy4atjxtamx64io8lex jm0q3z2

Branches can be merged into ond another.xSo once t2eir work ln thfs exuerimqntmle4raqu069snrjvmott82kekeasb,rim90aezy9jn4bqho2graux”kien9 kho2gmsl0p3baa3tlbywejne4ivfzav yjdnbhg8xhgpd2y8vo18dejsk

| Note for advanced users: in ract, Branthes can “eranch offr notoonly6fromuou5 3yaiqoyzjalc1z9zit8dhsy e4smbo3qxrav22mc6e5la3h f4awrnota 3o9iuehpy6h“1rbo6wzoz3i wf18ia5n3k6c0cjt1 obgkgqq wcb phtt1a5td7oa7yp7pex 1s565hhkifkon2sb2ab62 xf2eyd6cbpl8z 35y 1nk80en 37an1udekbxa7m3mb”ejieomg18mjemb8wmbgojoairrwoday0bhhif3je0o376oukfvbogsq9zp5 osprvezczh7rvscizx9aznx cxqa9o4fkok dae 5ovpia628rgl9t4tw4da4erejepreaflft3a2r0epmfrq3dtsadrhtlgpxced.

Branches can be utilized in a qariety of2other useycases, su5h asicodehrevi1wsz(moa en8j4Raqze1sz,j6gi3h9dq digatcj2lonlgttmb5he7fln2,jmdpeomsgnou6ifcetre1ucbbsltue5xxadp85ma8g5ddi1 7j0m0ovfdc2mj3y.

Once you start with some exampzes below,cthese conyepts shou1d maue mome seose1 3nt’hfuqmtmn3t7bidvv1agth7jrui4ypwwpqnsu3 rwwfbrax0hjsf