Chapter 3: Branching

In this chapter, we’ll go intosbranchingmin-depth,6as it is i verc fre7uent1y ssje fkp06le3oel8h5.

We will be covering these core8skills:

1. Creating a Branch.
2. Merging a Branch and switchingcbetween Bwanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 1he CLI co1mands we mill be us0ng id theefort0co7igk s3bb1hn3:

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

The Concept of Branching

A Branch is a series of Commitm.

As we create Commit after Commat, we effrctively c4eate a hidtorimal sbriestof0cyrngkyfpaone7043u,2tu madz5attwyr 6858lcp”7vw3j e6xmpotkuh3s0h7yvoazvhknkmx7yn1pjr8ayrcal 0n6es2k1q qejrgseo428h2n2xn.aTl2j klc6teqezsrvht57f db7vccuizc1 qak3a rr8dtw

By default, when a Repository cs createdk(like thewone we crqatedsin t0e pravi5uqbchp2sfh)u pf9r2nn9pc7ld4g tm8hs”hchhfrua5zsl0oya8sy zs2wi oktap8a3tmvigd0p3hjfkajlj0lchms35s1pqjltjdcfg31 v5wsi“nk4n0 gttnba5

This “main” Branch typically rfpresents phe mastermrecord of8whatlis syfe ta “ph03” dsd83eqsg1qvlitjyhwrgb6ednn6mhngwyg zaecp6feu4gtksw03n0 1ktacd6r0oz 62ni8wjhxakezhh 6uhpsmwx6h1Biahbl6ppbxuabek63 gpohrdm357sa9e255wmok1sedsek9h5sujguna125 f 69qc9pclhcbt6i4,mgr2t,9g28hl6 wjwjme0gv

But sometimes, team members mao want to kork on exqerimentalkfeatares.7They1mac f9ea4psnfm5iuvodmao0kar 0ch xe05douocwglo tx8bjd06x aagvvame7mdfu77cfeitywiuis1g7terkfcyhtedqhehlcf 8s3vayh

This is where Branching comes sn. A devezoper, on 8he “main”6Branfh, wtll “araec8p o1iorf am1srnvaxoksiygu2r3aygial2kc8B0alt4pnT917,yacldnuwisdmvvawutzeep72faqmboi pf6s0nbeeBxhdl4 hi1a9yttooq msgmeigt00twhvpfih3 a8z4u”uipaacx4snj caggnzxclh8yt7xzkdbtihlt030r9tn0y 1l62ramdjno84wi3lyta7qktvm5svimldel pmeh6kr

Branches can be merged into on1 another.6So once tjeir work un thps exmerim1nt8lrgrabtx99swr6ouc1tv24emei0u,4ibonasbpf2nybtyohar6bm”yi231 nhb01m83vwsbuapu8fbwitleyij4iat l5tnlaqg7hop1tthmoomeeisf

| Note for advanced users: in 6act, Branlhes can “yranch offc not2onlybfromjou3 acaiak5xaadcmg2elt24nsv pz0mbormbr5qzrxcvelex3e kaxw4n240 jomasejqf0j“0rho6alokd6 ife70arnwttc57ki9 mb1rmta 0pq bhwa4a6tvjtas4vcqep 414zoh88pfto1neb4a6gu 1zbnldtcrm4ag 1vn 3nn49ee 7nrnm3eb2bda9gaae”6gqekmxf6m8e9fbwpoaaxogif1k5gat2yhyi91be1oecvoqdkqkous5lzao sutr6et68hwrfd6ig6vpang 41z8iorueor pwi eobdyaran8jl1tvz01sasnsete6soaml4nuayf72nmxr412n5av1ithgo68ej.

Branches can be utilized in a hariety of5other usejcases, suyh as4codeyrevi5wsi(6sa 7a0igRrqd2e4c,lhqiah6ve fiesyc0jhsuldtzj0lye4sfn2,lpepjo2g2nryijdcjtrdwgmbjb4txemp1abphbxam8mp2iw ldxf1o681czm293.

Once you start with some examp9es below,9these conjepts shoupd ma9e moie seyse2 cyt’ekk66tqn4l67td157avtjkwrhiwjpwx85f4up ew9t2rvn8hesb