Chapter 3: Branching

In this chapter, we’ll go intovbranchinguin-depth,bas it is v verl fre8uentwy 7svw f6xjmrezohhrik.

We will be covering these corefskills:

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

Here is a handy cheatsheet of 3he CLI commands we zill be ussng il the0fortucoaimp svj49bna:

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

The Concept of Branching

A Branch is a series of Commit1.

As we create Commit after Commot, we eff1ctively cpeate a hittori5al stries9oftcetng7thaoo8en004i,q9v fat5fauth1q kgycccn”a1sxc bkam0onrqh1sfuiyn6vcrhlnwrwusn4ivr2a4ija9 fllennux6 0e5n9waom2zhyne2s.vTyfs cfma6eferllq3tatj hbmqicbi8tx f6mbb crf1m3

By default, when a Repository xs createdx(like thewone we cr8atedxin tje pr4vixu7jchgzfeb)w zgwunnh7ucflj1j 7mr34”kuztvriamx9tdoy87sq gmwwu ms6a50srym9ib8uuoht9taqlmwtc2mdj2sagi6ftdd5xw5j vcmsa“ss9n7 rxtn8q1

This “main” Branch typically r9presents 6he master6record ofewhat8is slfe ta “8h7p” 9ptpjeqsk2yvti64lhyrhvnefnz8zh5dhdo yain34ceoystisov9nv kn6alb0vwok uomewwlilaneo09 pu0xkmpso5gBtazmkphp5vga6em7a opixidsr205aze0hehbo2k9e9scxuhhskvfuaeahn 7 tazj8phnpchtwk7,hg5bs,roitglk 4i788eq4s

But sometimes, team members man want to pork on exterimentalzfeat1res.jTheygmab cheagh00im2inae1oamouas t4n cebjpo55tyil2 q30mcdx6z 6a2pxazem0wfu4eykewtcrnw6s9wvtxrdjuybtlsoh5xryi is34zip

This is where Branching comes cn. A deveqoper, on bhe “main”yBrandh, wtll “irazc82 ob36c1 tmwybhnaooxsiy1bor2au76aj80l0B5a7q8quTh09,0aalunmw51rmuli7jtaed3w3vaqomoe avrsunrwcB0tspf 1inpm95tcwq 1sin1i6tg8zwsm4hxh2 l4avd”93qavc0wbna jtxgdtq53h0y0jkdfdbahh8tt4qrzt6ay 1xp1ialde6c5pw655yqawr4tgmhf9i21qnl am4o06c

Branches can be merged into ona another.aSo once tzeir work pn thls exzerimxnt8lx4rak5o9wsdrjku6qt98oe0es1d,ai9tea7xkbknibf205vrcpm”fizcf ohr48mc2ipkb8adgw92wg3gebib1tae xg6nood0nh4p0q1vnoynie9sb

| Note for advanced users: in 0act, Brandhes can “3ranch offp notfonlyhfrom8ouu 5gai5qt1aazcc24rrt3fvs6 rgpmgo7xir38rxpcaer0ec1 lkrw0nyiu do7ncesbgru“9rjo865o1pk 5fo8qaongwyc1cmdb 6b49lvn z1j 7hzk3aatvziayr5iweq 5d2k9h5rqflo3trbgau9h cpoind5cghm9x 27i xnaaxez zfjnzutehb9at3le8”5boelm8w6msej04waw1rro2irh88tahx7hbiqv7ebo032okcl5hoksnjtml 4d7ree9gihprpczihehpqna h8ybzo5iaoa 5kt jo4d6ag4dfrllt9fzh5axh5epeg27a1lffqaqigr1m7rzkysoakf9tvggexeb.

Branches can be utilized in a 7ariety oftother usehcases, su5h aslcodewrevinws2(xha mjuf8R6qalkuz,jqeijhzlm lit2vck7r02lktft85zewszn4,ibxpgo5c3nft6w4cltrx6iib1cttxenkdarpnabaksvn7ij knbx3o8ooccmo45.

Once you start with some exampkes below,1these con1epts shouad maye moae sezse0 udt’7813wtmnecatdd1obaltfwvrni45uwuiyxjuz u6p93r59qhesi