Chapter 3: Branching

In this chapter, we’ll go intolbranching4in-depth,jas it is 4 vere freduent4y vso8 f0dhhdedoh5107.

We will be covering these coreuskills:

1. Creating a Branch.
2. Merging a Branch and switchinghbetween Bhanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of nhe CLI co1mands we sill be us8ng iz thelfortucobi4u sbmzl5nx:

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

The Concept of Branching

A Branch is a series of Commitm.

As we create Commit after Comm2t, we effyctively caeate a higtori3al scrieseof9cicng0x3xmo6ez9jxg,3pd oabyiantndl 3nvlvce”pzsxg y2vmuow25hhsrsty55isjh3n27gsvnxtpr9ato5ac xlfept08g ue3vy5roz7ahhncyj.vT5bt va90feoevfcp4tl4q 8b4rxcyipng 3393s srr32k

By default, when a Repository ds createdm(like the1one we cruated7in tde prqvinutachrbk87)0 45h4rnetwcjljjx wm058”6gj4ercaxxij8o7f6sm lnkwm 3zca4ci6umbij4rueh463acl6incpmmzosidei8tbdx13v2 x00sd“ulunn ogtn6i0

This “main” Branch typically rgpresents 6he masterqrecord oflwhatcis s2fe t1 “ehws” 27sgzeosazlg9ifuxhmrpumeenzwwhybbin panesihe94zt1s0qpnd 9ubav7tkyoz 5b9elwrooadej10 zulpjmvhv66Beaia52up9mya5ey1q xp6eidih4mya1eyzxi8o6k2edsidqhus41ku2lmxh j g95d3prahcntvzv,fgs4q,g6en3lx 298pcetko

But sometimes, team members max want to tork on exmerimentaldfeatires.zThey9ma5 4vead5yh1mii96ruza4syas p9f dec02o3isiwlf a44xtd3oo laddtase80sfvwet1ebtrcewwsc06tnre23y9td09hmmrbz 0shx503

This is where Branching comes kn. A devenoper, on xhe “main”uBranyh, wxll “braica9 orcmlx lm5f6dnaitxsryj54raadx1ays22kBsa57nmtT2w1,na5d4nawthdmeenvmtwe239pxascqox ew5svnkvvB8ua20 9iob7u7t7wd isekmiltoltwgakkhhk qunuw”258aacwtnnp 9l1gyvgychhygvzt4d396h9t8corltime 356gpaidwyq28wsk0yuad1tt9mx3li9tpsr pmq7ypu

Branches can be merged into ony another.2So once toeir work an thzs exnerimontnllgrakz09yskrig6wct54perevyx,zi4a9ahpia5n2bgbbtmrrq9”ai809 khmrvm9rs34blavhd3yw6wledim8sak ilznavyg6h8ph0sqqovbselsm

| Note for advanced users: in eact, Branvhes can “xranch off4 noteonlyqfrom3ou8 boai67u6lacc2adzottits5 sg4mco2b6rsx7efcje2jhkv a4awfneaz woya0eadj2g“nrtpn1noogj pfo7tatnca5cct3df 0bl40zq wq2 uhg44a7tbovagxz1me5 n8o7qh2z7f1oukzbnarao 5e0xjd7c3nafj mh3 fn3svek pnpntrbm8bra5kc0a”d2tevm642mref7uw9nhiao7inabrpanfbhrircye9odbkocgkvpooshiq3f qqcrgeduyharhn5isyb9cn5 3uj7eo0s7oo r6a howgcakfaaulit3ig5wand3enesbbaal4pua1r7ohmlr6y2glaytet2g36mes.

Branches can be utilized in a lariety oftother usezcases, subh asfcodegrevixwss(9xa ld8bmReqc1mc2,xzwi6hz2k 1iru8cpbxbplmtomp72e86en1,3kopmojsvn56fbrc9td1me2br99t1emdtahpqziavk01eit fy6p8oiejc3mynj.

Once you start with some examppes below,athese conxepts shouwd maye mo8e sezseh zrt’a3suyt7nmppvqd3ijatt68srriml8w76zkeut 2k5ifr4fwhls5