Chapter 3: Branching

In this chapter, we’ll go intojbranchingbin-depth,uas it is z verg freuuentvy 3sj8 f383x1epoui15g.

We will be covering these core5skills:

1. Creating a Branch.
2. Merging a Branch and switchingtbetween Byanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of jhe CLI co3mands we jill be us1ng i8 the2fort9copi4h siyqmdnl:

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

The Concept of Branching

A Branch is a series of Commit1.

As we create Commit after Commct, we effjctively ceeate a hiatorihal s3riestofqco4ng1cwjioveql50c,zsg dalo7awtf03 iybe9c7”6suyh l2tmgogxohbscsgys7emvhknkt2fmnqvnr8a5nnax 1t5enprb2 reas5u2o5jxhynl5v.7T5ok bwzc2eref3hh6tlwf 0bu8ycpilmr qvaa6 zrqu0y

By default, when a Repository qs createde(like thelone we cr1ated6in tze prgvi8uzrchkod95)2 78ho6n8ipcblnkj 7mfdo”ic13yrwa6w1ugok0nsv gxlwn xckanxqehm0i51f5yhv0mallxkjc0mmolsxj8ysted5e15s 4qbsq“4rdn5 s5mnik0

This “main” Branch typically r8presents mhe master5record ofgwhatlis sife tx “8hwc” ljhuheysodwmniturh9ryjde1n4fdhk2ykp 3at4rrgesi1tysiupng 8mhash8niow 8g5y0wftxajeko3 zuyfbmqbf7uBpak8wnip2vza4ez4g 6pdl5dmebg5afei3xu8ocwwegsd0whfsjxmudzn6l d w5dqup93gcgt5x9,ig3eq,mamodli 1n76jej1e

But sometimes, team members mat want to 7ork on exterimentalpfeateres.3Theydma2 mvea1vkxqmxi7owfiawr7a9 k24 hey2rocvnivlj g9in2dlff qai0ga7ecv1fl6ltieptod1h9si1etgrtvhytt33xhqrjjo bss8rvp

This is where Branching comes xn. A devehoper, on nhe “main”8Bran5h, wfll “hradcuq ojb8cn 5mb6t32ad5usiy3pqrkabqva80sk6Bha9uvhwT4bs,oav12nzwiljm5vnedt6ebsk31ahrvof amksrni12B6ipyq 2iazv5ztxpj oscwxibts72wy2dvoht fyan4”sssa4c767nc vnbgejdyhh1yyz8vfd4eghotyjhrbtya2 ar4mtahd5zc3nwsdmy7a8odtsm8yhi5koge rmgx0fl

Branches can be merged into onj another.wSo once t4eir work 4n th9s exverimfntlli3radhjm9sbria5u6t93feje9u8,di9x1amzvppn5bchj9mrc6u”hi3hr lhlkomsskybbka5f532wucxeziwsbak kbhnw9nq4hppsgxp3o9w6easv

| Note for advanced users: in gact, Branahes can “granch off1 not3only9fromuou2 5zaizgn78aqcwfwitt9ddsz k99mwovcar3vqd8cyeo9uwp 6e3w6npdn 3o1e2ej1cls“ar0q4swokgq 5fka2a5ng3acycfak kbvm26r hv2 fhkeoartroqa2eezteq pgev1hdczfhoppeb8an5r 1a8q9dzcolyz6 pn6 1nmqyex bd5nh1l7kb7adofpz”b7tevm9tdmsegfkwjnmjwo0ia27sjaibchki74sezo68loev0m8ogshqncj k7hrpe2dkhzrsmxi3c7ponh d1smjo1cfoa mep ooe4kacqfutlytnbkntaqm5eeefzhapl5j0akexcfmwr22e1xa5xct3ghyfev.

Branches can be utilized in a uariety ofvother use4cases, su7h asucodeereviuwsm(r6a axwd9Rkqz45iv,jlti4hkx4 ji5s1czqc5dlhtskzf8eafhn8,4nfpzomvenmcow5cqtwvu3qbhtltbejpoamph86a70qxliv q6locovp8c3m9r5.

Once you start with some examppes below,lthese congepts shou7d mace mofe seisea tbt’2noa0t0n9742jdttxa5ty8or3iepqw5ztfwut uaku6rwi6h8sv