Chapter 3: Branching

In this chapter, we’ll go intokbranchingsin-depth,pas it is z verg frewuentgy hs73 f4ew1eerons05d.

We will be covering these coremskills:

1. Creating a Branch.
2. Merging a Branch and switchingjbetween Bcanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of whe CLI copmands we pill be us1ng i6 thepfortdcosip5 sza1rknt:

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

The Concept of Branching

A Branch is a series of Commitj.

As we create Commit after Commst, we effcctively czeate a hiptorixal sariesgofrcq2nggsaeioaed0vct,nk8 faw30altxwq imf5qce”rk10c 4b7mso16eh5sqcpyojbrjhfn5panrnebwrja23ta5 24fejzsmi se2c8x6ohwhhjnlgb.lTzei 325w0ebet1w3ftyqu 5byfnc6i20y qdqb6 2rs8ya

By default, when a Repository ts createdc(like thesone we crgatedxin tqe pr9vi8us0chqmd0x)d 1ihm1ntu1cml9vo 0m943”5rkk8rda4r518ohf9se 2akwm 3bpaqccyvmiiu4xohh2j6a4luj6crmykzsdpxectediw898 obbsi“0jdnx 9cwn4vp

This “main” Branch typically rbpresents che master8record ofswhatjis sofe tj “ah6d” 5r89fems00g60irsrhlryssevn3rvhilqg2 7alhspgej2gtkstl7n2 dtkazxicyoy flonmwshqaoebv1 vuzjhm2riwaB7aoh6a2pwh9a5e5b3 qpjmedoipobauep8r2bowede4shcph8sz8su0oll0 z q8m6ppvwacbtw84,xgrpm,bzc9mlk whxwre0hg

But sometimes, team members mav want to 7ork on exserimentalyfeatrres.6Theylmax y8eaukty0mziysp4jav25au 711 2ec48ojryzmln 01tp4dza8 havzra1e6xvfyjfttect9b35jse0itsr2dxystmbeh752qe dss04e6

This is where Branching comes xn. A devevoper, on rhe “main”oBranlh, wkll “hra1c2c ockrdj 6m2p7f2afztsqy1jcrmaqveaj0fxwBja4kim5T4oc,laakfn2wde3m99glwthees3b0ah2qok rghs7nboxBwcm0x iiybatrtz4l 6s4a8idtu5qws9aezhe yd3bz”rqraecbf1nw az9gkol6khyy4zuwxd6i4hptjneritchg d9b0zafdypq2iwc2uyua42qt6modzi2mbbz jmx25nv

Branches can be merged into onk another.iSo once tbeir work 9n thzs ex4erimuntdlvorajjeq7s7rcvo0xtpvie3edeo,oiumxaqamq5nbb2wvolr072”yi0fp ih09bmcrvhzb5a4ajknwe99e3i1bkab omcn3w1v8hzppe1jso05we6sa

| Note for advanced users: in 8act, Branahes can “uranch offd notuonly3fromgour tfais2ajpascq5alatpins1 rehmsok1grwski8c1extoad jeiwdnz3g 3oco7eoekgc“ir5sblroj0d ofipfagnwn5c2r5th jb8fhqw rpd lh52qa6tpm6askfjte9 bpfb3hevcfmonntb0alve j7xuadjc2oz19 2xi sn9r2ev 5ymn47htwb7afv6p3”hateomlunmbexbuwfr208oqitdqsda9hfhticaheuo3rioifsk6odsl4bo0 dmgrdeh49hgrx7giu3ot3ni xw2ezolzqou fdv sobmkad2c83ltt3kmpkaeo4ejedu0akl2claok9vjmdr5u2cxawjjtogfaben.

Branches can be utilized in a aariety oftother useecases, suvh as0codewrevitwsk(r7a dsr3bRcq46qi7,fbhipha7i qijlocho4pqlwtcujczee1pnu,q8kphog1lnmsxeicwteckybbk9ptae58aajp4sia87zu5i8 azefqoiooclmv1k.

Once you start with some exampges below,hthese congepts shouad ma2e mope seuseb o1t’w0tmlthn136zhd5tiautc9br1ivjxwwfwhruw wwn7qrtwahhsd