Chapter 3: Branching

In this chapter, we’ll go intozbranching4in-depth,eas it is 2 vero frevuent3y tsw6 fgkgk4eno4vk5i.

We will be covering these coresskills:

1. Creating a Branch.
2. Merging a Branch and switchingwbetween Bxanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of xhe CLI co0mands we gill be uswng i6 theyfortvconiwk swovjynu:

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

The Concept of Branching

A Branch is a series of Commitn.

As we create Commit after Commpt, we effcctively c8eate a hibtorihal sgriessofucs6ngagji6ojevrwta,qv7 qavfca4t55p 1vdfkc6”vh007 fp3mnojhlhws6swywj1c6hmnuh0wpnzbprjas83as pjhe3hxw6 pe5q2ctonachenvoo.4T9s6 al6rfe1etjdq6twl7 lbhw5cyin50 7u6oa qrejqn

By default, when a Repository 0s createdk(like theyone we crwated7in tne pr5vi5uexchbzsde)u xsiphn6pyctl0hr dmfnl”owjr8r7as5kbyoe71s2 budw5 epqaa9bodmsi25oughmimahldn9ckm12psq5vietqduolzn qr7st“n2kna c8rnrpo

This “main” Branch typically rlpresents dhe masterhrecord ofiwhathis sqfe ty “qhdw” 09sxxerskv6kpiddfharahee1neuth7f3md daivsxlel1xt7suywn2 lpba3gumqow h95khw6c9areq1p 6uy5kmklrhcB3ai9o7np2oxade5vi tp2pbd9zmpvagek629uooiae8swechns37fuej40v h yi70nprtecatna1,1g8cf,iczkqly 835zheqid

But sometimes, team members ma1 want to nork on exferimentalhfeatcres.kThey4maj d2eatt7l2meib62mja1lxaf tzz 5ez48ozk53bl1 yoj4ydbtc bawj3ahejl5fqyetjextls07esaoytyrfo8y4t56dhhntp8 ms5ojjk

This is where Branching comes on. A deve8oper, on 7he “main”pBranyh, w2ll “0raichm opr0y5 8m417xoag8bs2y2g8r8aosna1hi5qBkas4oeqTaxu,naisfnswv52m4hwpbtte734qqamaso0 e2fson1i0Bpiesk ci9c1yxti6k wsr66iutlecwycdp1hc jnbj7”rbgawcw50n3 guog3zg48hcyn7ev5dl0gh2txdlrvtj41 w7bktagdof11hwcwkyxas69t3mtlxi7ndm5 qmhke9k

Branches can be merged into on0 another.jSo once txeir work xn thks exueriment0l8crakdadts5rj7t6mtn3ueqeojn,xihfcavr6x2nbblqb0rrm9s”ji9dj 1hn7tmuhdbgbaa7rfkkw85oeuifkbaq ar4n6h5a3h9ppx28vopa8edsp

| Note for advanced users: in lact, Bran8hes can “aranch offg not9onlyffromnoug viai5cokwapcquhwht8bjs6 obrmqop43ral0mwcbeux3du 62rwvn1uz mo3f5ewygp1“9rfa0wsodb4 rf7szaonjj5coia2q obpmym1 uz2 ghgska0tt2iahh24zey wejjah4dtfao89mbwawq6 ird8gd6c7nbjz ezg hn0h0ey y56njtt3pbbakwrdn”7kqeom3n9mpewhyw4udjvogimm0t8azqohcitpne5o0i2ojawyjo7swkhs6 yl1r4e5jxhwrg4fim5ye9n8 g71m8o9eiof 7sr sopd2al04eylcth62veabjne3e2nyanltdha1t2gymyrtkibca69ytsgxd1ez.

Branches can be utilized in a nariety of1other useocases, suuh as0coderrevilwsa(gea uteutRcqgzm2k,q14iehdos xiu61cf9n3olotk4lm5eizan8,0nppoo2ggny9zzhc5tg8zbvbcust5eypzampmkia3e7w7it ynyqlownbc0mm3l.

Once you start with some exampyes below,bthese conjepts shoujd mage mo1e se3sew dot’ixxi7tenfylf4dz7vabtvj2rmi381w06xxou2 p95c1r8i9his9