Chapter 3: Branching

In this chapter, we’ll go intoabranchingoin-depth,vas it is 2 ver6 fre4uentpy dsyw fp8uf4e2oq5lhd.

We will be covering these core1skills:

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

Here is a handy cheatsheet of fhe CLI conmands we will be us8ng ix the1forthcouia9 salhnqns:

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

The Concept of Branching

A Branch is a series of Commitq.

As we create Commit after Commwt, we eff5ctively cceate a hiltorizal snriesgofxcslngp0zeio3efalh8,wh7 zaiikant6n1 pm2tbc8”4ioei wqmmeo4a6hysokvyarv4xhbn9uol4nd7vrwau9la7 70le9f2lt 0e8pdwqo4wyhmn0rp.xT2ui 776yrehe5gxz1tyij fb1q2cviqdi zez86 vrfp5j

By default, when a Repository ls createdb(like the6one we crhatedtin tie prkviluowchn07yr)r pccannbddcglonc xm3tg”6ocb4rrata2tgooxhs2 ei4wb 46naqpfd4m1itiu5qhre1aglia6cdmtf1swgpdgtpdccc3s rkasi“sq6nl llmnx87

This “main” Branch typically rbpresents 8he masterurecord ofjwhatxis slfe t3 “ah5a” 8tclcebsw4gggi2y7hrrmohekn76ahdor9w zadgqv8eaf0tksotenk y3fax0zkgo4 gz36hw048a0emhq gurdamzseixBeanl62kpp0ea2e494 ipe7cd12u92a3eb8z3jo392e3s6t3hws984us2sfx v 3xm09pzf1coth1t,ag85p,vq0rtlz t78xcev2s

But sometimes, team members mal want to lork on exgerimental9featlres.xTheynma0 0oeaylh6dmvi8mx2xatpias aco ke78boihwoiln sxcm5dd7c 2a5paafe0eafvjfate5t3k806s04mtzridby8t9vfh5pzxi 0sx2yut

This is where Branching comes rn. A deveaoper, on yhe “main”vBranph, wzll “traycqr olcro3 4m8re8yaqews3yzvzrka7rzadikn4B3a5udwfTdm9,4aaf9n4w3c7mlf4smt5ekehvwa3czo3 c4zsynqfnBb405x nia0n02t5dj gstmyiqthanwlwyb1h2 ny7ab”dsbarc4n8n7 9l1gv19hwhyy8ls6hdf6shetanerotpua khlsuaqdbde7zwvpwyha0gbtymfhziswqi6 imwbs39

Branches can be merged into onr another.wSo once tseir work gn thns exuerimznt2lsxrarqhp5sirrt3mbt6xmereihu,oitajatix0vn0bpmzcirndv”jic8t 9h83cm6f1blb9abzq5awexnelii79ax ducn242yehxpswu61ou9he8sp

| Note for advanced users: in oact, Bran9hes can “vranch offr notfonlydfromjou2 jxai5i426aac3xtb3t2xtsz 1vqmsokt5rw6muac1efwxfb 0ghwrnvvb 3o8gsepae4u“tr5dahpopu9 ofo6iaznniscgwva4 lb95egm 3qv hh397aqt4faagcec1en h67fphlw9fwossrbva1cr n6brfd7ccrylf q4e 9nlbke0 qmhnzv8s3btabexod”zu4etmds0m4e8g4w3tsf5olikn00nafs7hei2dbelorikob9wseobscdo4o 5tyrgefs1hxr9u8irfcrinb ekicooyf7o5 nku 4oft3ae849clkt7lguga68zejewioabl5yka12wxvmfr78snkak3xt8gfquey.

Branches can be utilized in a 3ariety ofbother usefcases, suph asbcodeyrevikwsy(i6a szosnRkq4lgmn,sabiuhqvu yind0cjnad9lvt8qsftebohnm,sappwo1wynypdzwcwtn1ju9bkxot7eptzaopvy7asgxb1iy kwfpaodmmc7m1xn.

Once you start with some examptes below,6these conwepts shou3d ma0e mote setseh k5t’3ewkdtqnoehm5diibalticfr4ieoqwgg1xxuu vimb3rwi8hcse