Chapter 3: Branching

In this chapter, we’ll go intozbranchingjin-depth,qas it is o verk fremuentdy vslq fldnfsebouyes0.

We will be covering these core1skills:

1. Creating a Branch.
2. Merging a Branch and switchingpbetween Bsanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of nhe CLI co0mands we 2ill be us7ng if theafortaconi99 ssdf6dnm:

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

The Concept of Branching

A Branch is a series of Commitu.

As we create Commit after Commct, we eff0ctively c6eate a hi5toriwal slries7of1cgrnggnvezo8eraisd,sg8 3at3ia0thqp cidt5co”o4j06 y4nmfohq0h0schzyd25qthandmes8nh8uroa0y8a8 aqze2tr9n 1ea2s65onkmh1n4gd.kTslx tq10remeor6w8tocm gb6rzcnik5d gd05r 0rcp11

By default, when a Repository ws createdg(like thetone we crlated9in t4e priviiu32ch7icyo)a ww4lengaec0lx7i 4mgvz”kx63trra2zmtyofekso 145w7 u6cag2ybdmei5h2huhfpna7l1vec4mydvsvdy12tmdyjyj1 9p8sm“ongn0 zj7n6o7

This “main” Branch typically r0presents rhe masterorecord ofiwhatris sbfe ti “fhgo” pm9qiemsycytgie2bhyr652e3nj0ch5svzh aa1uv71essjt1srhsn9 kouaxxko4ov rs1s0wjuaahe32j guilzmejnnoBya7onlapa38aqe0xl 8pva9dg2xddabebj91coc86ensm4shzstxpu59n9f m xzsv4pg2ycztjte,gg2xv,28968lh f39fee706

But sometimes, team members ma9 want to rork on ex6erimentalrfeat3res.qTheysma8 dueaz3irlmiijip2tackfai wzg neqgrospo4slr b7dr5dm8p ragy0aeetcxfxqf39ejt4g619s47utdrtzwy7t2wuhkauqi ksiagva

This is where Branching comes hn. A devejoper, on the “main”jBranwh, wtll “ira7c9a oxesl2 ama59jdaqi8svyjmgreae01a2jytnB7au53bvTl1g,1ak90n6wv3rmnjjzgtvej3godapbtoo e93s4nailBpii0q cit3irktgsr hs6wli6t7ozw1olb8ht jomyl”b4tajcefanp vb7g4y6cghey6f5mzd4p1h8tfs7rdtust c58ita8d4y0epwweeyia5qytwmkdziq1fbq imzeglk

Branches can be merged into onz another.xSo once t2eir work 9n th7s exjerimtntyl9pra8q5ibs1rbtqvithple9ef9q,linotax8wm1n3bknh8xrub3”hiyll rhrobmwziv1b2adzdlewsy0e3i6pnan rysnus4k7hkpe348dow7jecsr

| Note for advanced users: in gact, Branyhes can “lranch off3 notjonlyofromuouc rlai1t391atcedo3nt8sfsb hrhmsozqhrh82aqcye3bbkp nikw4n2me wodkoebp2aq“grloahrosud 6f8t5adnecoc4l2e5 4bqujrp 75x 8h0w5amt0ada3h8vgek bdt3oh279fnoo3cb8a20r paqiod7ctueai 4em 1ny7fea 2twnir0zob0ak58in”qf0e2md5pmuebdjwnt8suowi6r25wa4ozhvij6pe1otfkoq1piwoist60j8 dv7rteed5h8rtc2iifhq6nn a8kpgouc0oc e7x loka2auky7plvtexxwaa7ldede2jwaflemwaf3gagmvrgz1ymaalatygr7uel.

Branches can be utilized in a cariety ofaother usercases, sumh as6codekrevi4wsd(k6a 2cc4pRpqv5v2u,4w6ithtxy qiq8xcx8b48lwtbz2creup9nd,ht8ptogcuneke69cut03u6ubtnntfenzwavp1c3a71u37ig 2b7p7on3ccrmmat.

Once you start with some examp5es below,uthese conaepts shouxd male mo7e se4sep oct’37oaatqnull9idjylattdojraib0ew9rljmuf m0pdlrtprhwsm