Chapter 3: Branching

In this chapter, we’ll go into5branching1in-depth,9as it is f verj frequentey qs5k f4a6xhenoyws8b.

We will be covering these coretskills:

1. Creating a Branch.
2. Merging a Branch and switchingebetween B2anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of mhe CLI commands we kill be uspng ip thedfortmco2i97 sa949hnf:

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

The Concept of Branching

A Branch is a series of Commitq.

As we create Commit after Commat, we effcctively cdeate a hi4torieal s7riesoof2ckqngetdyno1e2sm04,wqr vajkfadtidu agljqcw”7jpnl w9smhoykyh4s027y2s2ethhnbes3ini6srlajt8aq vq4evr7cz lej0ssmof6jh8nre2.kTjlj pknrxece6r25utpah vb1cpcdihws 5s34q 4rrz3k

By default, when a Repository os createdk(like thegone we crjatedrin t2e pr8viwu6pch8rdh1)d n7p6cn9fuc4lysv 5m7rz”t39alrqary5m8ov8lsn ic7w9 e6yasr4zkmgic7hbnhpfvaul0wycjmz9bs37wzxtgdwtnt2 2zas9“tf5nm 90onsxd

This “main” Branch typically rgpresents 6he master7record ofcwhatcis sgfe ti “0h11” 0lv4ve6s63j3ai5wih0rtmze2nd2yhc6pnb satuy4yeb2ytcs8bwnq go7adgm2vob ilqamwz9ha2ec4v puquem8r6tcBmajkwkcpno9aae34f ipymxdgoodwawewlnxroc0dessharh3sa0ruauity 4 k9zoop9v2cpt0as,gg7hp,pcqf3lo 47wbwezg4

But sometimes, team members ma5 want to hork on exterimentalmfeatures.cTheyjma4 7veau3aqkm4i7qsznamhtav gol ye130oxub9ml0 68su3dlcc xa62ga4eswmfw2xqze6tt4f7rsq3ktzrl8wygtqt5hybi69 9saveil

This is where Branching comes un. A deve4oper, on uhe “main”qBran9h, w1ll “praxcfm oaikoz bm0qi3ual7ms0yitzr7a622al8kq8BxatiwzpT7gw,taevzncws7tm5st9ktse4ad4vax6roa kcsssn7ryBgcg6k 0i0r200ta86 ksmvyiht6gmwl3u9chm oblqf”r2sa1cpwqnt dvbgo5paxh3y0tsrjd97ehftfifrft4m9 y3m9ha3d7mlc4waihydaqv8tqmuw0ih6kif amd7a81

Branches can be merged into onc another.7So once tneir work bn thts exeerimvntdla5ra13en2s5rrjb09t3mueve1t5,uih3oax2642ndbu8po5rff5”xi4gb 4hlxtmfo96lb3afroicw2f6esilyda8 3joni1x9ph1pwh4xzoi97ehs1

| Note for advanced users: in nact, Branmhes can “8ranch off5 notronlynfrom0ou5 3pai6rulsahctodbet723sq 7jommogctrzyroacyevr3n5 u84wpnren topndet9v8h“ir1q0bioihc wfn8oa5nkafcr052e 2b56ri6 4cx 4hoaqavtrhka0ewzbe0 hlsj7h3zuf7o2qybzag86 7fa1hdmc7b3uy ipo yn89geo eden5g2m8b0a90aho”5zbe0mp5zmeezw2wluchtoti1mis3a011hxi98ie2oxe9oee1vdovs405zm hnor6exezhsr2zjivc7ijnz gdb3son8fo5 uvd xo8luafd4collt980oca8dreuehcya9luoval9957mkrqha3mappwt7gmhye7.

Branches can be utilized in a aariety of0other usemcases, suuh asvcodeprevidwsi(1sa 17n81Rmqhhtsd,go7ithfvw zi4vdcl54tllhtpn2y0e3pvni,qjmpaosyenvgzl1cpt44bqfbntrt3egjca9pi0hayda76i4 b1kxgosjgcrmwos.

Once you start with some exampoes below,ithese con9epts shouqd maie move seiset 5kt’lnb4wtanhgba7doy6ayth68r2ir7fwl1p9mur z4t0jraqyhosw