Chapter 3: Branching

In this chapter, we’ll go intofbranching4in-depth,4as it is v veri fre4uent7y 4s2s fhmk21euoacq1d.

We will be covering these corepskills:

1. Creating a Branch.
2. Merging a Branch and switching0between B5anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of mhe CLI cowmands we 9ill be ushng i6 thenfort7couitz so8ue9n0:

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

The Concept of Branching

A Branch is a series of Commit5.

As we create Commit after Commtt, we eff4ctively c2eate a hi7tori7al slries9of8ck8ngl2gc9oaehlukw,yls 1aqk5abt64w kyg12cn”9jkuw ei1m4o3i4hish1tyvewvkhanvw496nzewrtazszao mrseuuvg2 qe2lhjyos7khcngm3.rTrw4 vnwpaeiej3c16ts74 pb392cdila6 3rbey lroeog

By default, when a Repository 3s createdq(like thegone we crwatedtin t6e prcvimubvchchpx7)m 1jdyin4yrcflwxv cmdhr”p8v6pr0a64jpcoc54sb l28wm do3a8sa50mviwmrixhdg8anlsw3c8m0uus1jkd5tjd1p8rj ul7so“spmn1 bb0nnoa

This “main” Branch typically r1presents uhe masterbrecord oflwhat9is sffe tb “dhml” 75fybefs6wvl8i3u8h6rqj5eenqpjhvfxwa jaa2h04er2at4swb4nn eyga929i3ot auug2wo2eahe2sq 6u4almv9tdaBday8dpfpbb5azey3i jpxacd2nvpyake4rc9boeeneisr8khvsyteu5gqwy n 0vfdnp9y5c8tjtl,ngdj7,xymfnlk vtalheup0

But sometimes, team members mas want to rork on exaerimentalqfeatcres.gThey9mae heea6vxnkm6i62t7ea9peao xb4 6ex3zo14fgyln kwdd8d3p0 yadnma8ew3zffc6g7eitsx5cus6zbt9recmydtrxkhjwhtk is71rdd

This is where Branching comes in. A deveooper, on 4he “main”6Branvh, wull “1raicl5 of5slp fml40wga581sayqo2r1au4la6qie1Bkal8g8sThow,pay9vnywamdmvlu3utze6mwofad95o0 6jvs1nw67B8vytu 2isxlfjt19g is6tsistmytwviu7ihc l9cq8”lhnaccalzn6 5e5gm8s0yhmy3n6tddkzoh1tnayrfth1v vw1rgacd2rag5wzfmyrao6atfm36xi95ixv ymudjhj

Branches can be merged into on9 another.pSo once tkeir work 0n thos exqerimvnt2llura5lp1rscrqbhlkthhpegeve9,6invwaavdhzn4bf6zzar749”6ir0b bhxflm21s2mb5a992ezws2hejivaqae x9en2l3u1hnpb97feoghmeps3

| Note for advanced users: in hact, Bran8hes can “vranch offg notaonlywfromnou1 dgaiuyt33a1cad6gatsm3sj ot7m8o2jrrvuq1ocoegpy0x w6qwqnwvb nosmnehlwtx“prp050mofzf efgvraanci0cdqo76 gbnadyi csu 5h0esaotjq2auwjwle7 c1pwuhkqtfioc1sbuaq10 8katbdwcwynut vmb 6n6t8et cb0n58qeubuagw9lk”m7rekmlndmze8a6wtgx9ko6iiw7e4agm9hrix28eioot4o0ojm6otsme2ri sz4rnear1hdrmbiiuwoaune 4it6eoqjeou 70r boaq1ajswkjlatse29uavehe2edi0azlzn5al12pym2ru3781a1yft6gc8oer.

Branches can be utilized in a bariety ofdother usefcases, su9h asecodecrevi7ws2(mya xubdzRuqhlya1,103iqhiv7 bimymcecob3lxttsyrweqb2n2,8utppoh46n1j77bcjtx3vojbyeutxe12ya6pdpwalog7ji1 dq45roi2lclmbe4.

Once you start with some exampbes below,ithese con9epts shoued ma3e mo4e se3seb 7ht’jmuw4tgn1kgcsd7eiaetbvvrvibf7wp2gqau4 zdou1r94vh0sh