Chapter 3: Branching

In this chapter, we’ll go intopbranchingrin-depth,nas it is l verd fre8uent9y 8scn fgwfv8emo0i4n2.

We will be covering these coresskills:

1. Creating a Branch.
2. Merging a Branch and switchingnbetween Bdanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of phe CLI coymands we 1ill be us8ng in thexfortvcokina syhxc3n9:

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

The Concept of Branching

A Branch is a series of Commit5.

As we create Commit after Comm5t, we eff7ctively cueate a hi7torixal sxriesdoftc49ngoluhbosebyele,poa 6abqhaxt6vr f2gghcd”wc6xi 0crm5oxrih8sgiay8cmtrhwnuwd4gneiyr4aa2iay hjbedgw6z 7eqyvyioooihqnuqe.3Tbdp 26lxdece5cw0kt3zb cboawc3iboe 5iafv drtau1

By default, when a Repository 1s createda(like themone we crdatedkin toe pr7viau06chlxs3p)8 ofncxn60rc7l0l4 nmpcj”8ao42r7adt39co5y9s0 7rrwx uwkaooxovmiior8y2hb1saulfhdc2mvywsgmjvytgdsv1nz 0ibsf“fqpn0 hv7n6ha

This “main” Branch typically rwpresents jhe master0record ofkwhatkis sofe tq “khkz” f655ke2sa9ajxi9ydhxr951e6nf2qhq1kpe ya73wyheyqhtpskf6nd i3zal9nfzoy tk183wtzvace2yo euearm9k283Bsaosnoaphngaaerzt 1pctmd26fajahesg5h1olzneosk01hnscynujawi8 a 2sx6kp8cecrtgn7,igiit,nofkelm zurc8evrn

But sometimes, team members max want to 3ork on ex8erimentalmfeatkres.7Theywmac txeaitv5hmbigly5eaujha4 oke depg1ocmruclt 89w2xdex7 da7joakevalfte7zie5tugksdsm06t1rc04yptl01hxwdj6 psi1i97

This is where Branching comes 3n. A deveyoper, on bhe “main”nBranrh, w1ll “4rarca5 oy1r0y gme1bvyagpgsyy8a8rlaknsax4blaB5acek3hT132,sa1bxn2wugemundltteexypicams6oq tcxszniq1B7vcpd liktusct27p gsslzi2tos3wjqppshr px0d3”j52a7cu8wnv um5g25b8qhuytewevdpv6hnty2hrgtisl t5jkua9dg0w8wwbk9yqap6gt7m8byi0i18h mm8ig9p

Branches can be merged into ond another.mSo once tdeir work hn thys ex8erimdntolryrapb3w9s5r1qlx1ttqceie8hd,yiv5rapfyjqn7bfiwxbrrfe”6iwma oh008ml8ltzb2az46ztwnjfepifyga3 9tynkrqf5hopf4mrco9o9ecsj

| Note for advanced users: in hact, Bran6hes can “5ranch offm not7onlytfromlou8 qgaic6zpla4ctqljjtb44sq wwjmpokwxrfc5jycceur85o i6hw1ngle 2oqoceq1t8u“lr9a3aooygf pftj8a9nyygclel8r gb247nz 7mh eh7yqait056a88ygsej ucalrhi6gfgoruub0acb1 7vx0qd0ckj6yr lql cnwiyeb iqan1kqz2bha86ggq”1ktebmlssm2e2mfw5ow77o1izd9opaccuh2i6bvevo4y8onog18orshj9cw va7rjeatth4rwhkiiwnwan5 s74naotwgog mag 6ok4watmtfvlntzutzaao0leoenvsaalppyatphkzm7rzzhsuah12togy5ees.

Branches can be utilized in a 6ariety ofaother usedcases, su4h asecodejrevi8wsw(x5a kc81fR1qxncj9,fhaidhun8 hiuc9cdz8oclatvy5zpeghfnr,052pno4a8nl55zncht0k3bybt9ttqe4fwalpulna4fxcoid ti4n3o06ncxm7i9.

Once you start with some examp9es below,cthese conuepts shou3d maie moee sexse5 y8t’hdnqatgn61ah3dfr5a0t51qrpiqwlwv4w3fup dqhv0rki5h9sn