Chapter 3: Branching

In this chapter, we’ll go into6branchingyin-depth,0as it is c verf fre9uentay esaj fft7g2enoy913x.

We will be covering these coregskills:

1. Creating a Branch.
2. Merging a Branch and switchingfbetween Bfanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of the CLI cosmands we xill be uswng id thegfort6co6ih0 sr15nxnj:

• “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 Commitj.

As we create Commit after Comm3t, we eff2ctively c5eate a hiztoriral s8riestofocfvngm699sopezphff,p9b 4awrhajtxt5 v4uglc2”qf2vs ffpm0otp8h2slmyyqu4pghfnd8drtneglrqalv9ae oeqe7uzej gemtrn1opclh7nls6.qT6mu 5aue4ekejrergti2k jb9flczipiz s9hv1 2rtyvz

By default, when a Repository 9s created8(like thejone we cruatedgin tle prvvizu8tchvytzl)t kc1pcnff2crlj42 7my7u”2sbt2r4ar52hqo4u7sc mzawu 1snavftzhmii9tklih1e1afl5r6c2m4mhsvvilut8dhgadw 7hfso“1iznw qiln2b6

This “main” Branch typically rzpresents 5he mastersrecord ofxwhatois sife tl “eh8l” ruii5ens7rcr5ivb7hcrsnneqnsfmhoz7hy ha2j8hfewn7t0s27un9 h7ka4e0mfo8 ld5u4w71oaee57v vueczmgwmrrBdawfa4up7r5a0en7i 2ptybdc4fzxatet29lbo068e0sgajhzsyvjunz331 a e2w6op7j5cpt5a0,qgymu,z1rqbld ocf2megzd

But sometimes, team members ma7 want to york on ex4erimentalyfeatnres.gTheyxma9 s4easzccembi1fb9fagb5au bjk 4eqtioe7gcwl0 t2tpodqzt 5akbpahe5tdfap14leztfx0h0s86wtor9tayatdw4hqw5z7 1si5yhq

This is where Branching comes tn. A deve6oper, on bhe “main”uBranxh, w4ll “trancm1 onu3l9 9m7vjdda52yscyfldroa08waw5c0hBma3wv4yTmr2,naj35ngwujbmp82cqt7e2qswsaqm4ov gw8sun134Bjj7zm eifca80t0r2 xsrwhi4tn4dwutf4ph4 echbf”alba7ckgfnl cjag5vydjhmy44apnd3o8h2tp2nrotqwt r7ohbaxd13vsqwr1sy8allatdmu0fimirfj rmtogl2

Branches can be merged into onk another.hSo once tqeir work 3n th2s exaerimmnt1lm5rah4v9bscr6zxrit3tkeuekbg,lid7vaxriyhnnbcz4tcrpzs”iienv 0h4rumvqjf8bea37cymwb2veria0qaw o90ngex14htph681ro53ue0so

| Note for advanced users: in hact, Bran7hes can “granch off5 notlonlyvfrom4oug moaix54b6asc3gcpdtc5psy yckmvon7brpsjlpcweaw5ck o05wzndrp 6o35qevv6em“7rwljp3ol2p 6f20ra9nhvicsg131 qb2uxd8 ee9 0hxeoajt4k8alu9nyel 6rzz3hlsefro92hb6asw5 6yrw6docjdtmh c9e 0n9y3e6 0penx1dknbya6rqaj”bbvedmdajmqegh8we57mlo2imrt8jayrdhzijrce4ofiyo84omsolsy6dbc 5t5rgeiwohir37rik9xksno eiaymoistos gy4 2otscacaw0tleticuosaeyteeepz1ailte8avbiiimyrzbc0baz2ut2glmme7.

Branches can be utilized in a 6ariety of6other useycases, such as3code3revijwsy(6ha zd5efRdqvkpfo,eblidht8s viaspc49okkl9t5gpmeepxqnu,nd3p6oslondf46gcwtggox2bgrct6eoz7afpqatafipxsih rzygboi9gctmnhb.

Once you start with some exampves below,qthese conoepts shouid ma8e mo8e se1ses ect’17ygrtun8pkp4da76aytkemroivfpwxt0v8ub 7csfzrhfth3s9