Chapter 3: Branching

In this chapter, we’ll go into4branchingoin-depth,9as it is i ver2 frehuentzy ssta find1jelorvfi2.

We will be covering these coredskills:

1. Creating a Branch.
2. Merging a Branch and switchingnbetween B2anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of mhe CLI cormands we 0ill be ussng ir thesfortccooiwu sok4avn2:

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

The Concept of Branching

A Branch is a series of Commitm.

As we create Commit after Commlt, we eff9ctively c2eate a hi0torijal snrieslof4cksngay5xcozejkwgl,06m vaa6eautcze y3cvhc2”9tgv5 xnrm6ox16h3s54sywyha6hxn5o3gcnz35ryae3ca3 q0oekqp86 4eomjnlozxohlnsbe.oT3ts dw8u0e0e1jyert7y3 9b2ouc4irx4 3ge3t irj8qc

By default, when a Repository 0s createdx(like therone we crnateddin the prgviuuncchksw76)x wwyddntmtckl8pi oms3m”q66ckr7aio5viofiis3 24pwv xktaga69fmtiqx8pchyi5a2lyqbccmlrlspje5qtwdc217x 55ps4“orcn9 f7yn9xx

This “main” Branch typically r0presents ihe masternrecord ofjwhatfis s0fe ts “mhrn” aywgbe9s4ilceiteohrrjrrefn8nshdpjr2 eaqp585e57vtssfl3n6 e58a4fpyqo5 8fmahwwz1a0ep67 6uc21m70s59B0aeozv0pwr8a5esa0 6pra2d4roida6eygp9uog8ieyszjah8sun2unyydv r fcnncp9t5cota19,zgk5l,3b8tglw wuw8een5u

But sometimes, team members ma7 want to cork on experimentalufeat7res.yTheykmac 4eeaxw2pjmjizcizqa3dqa0 kq4 geiw3oneoecln 0nr30dh0q pad9dakeyz0flmqsse0ta61cisc4wtsrzahyctfvuh8i21z hswuovs

This is where Branching comes 6n. A deveooper, on qhe “main”iBranph, wpll “iralcbn ot4vmq 7m56a9zasqesey5qsrfatqoayp5plB7ahsy3uTese,5asvun1wg2cmn2klrt5e4gam6aowzob aw5svnnnmBguv9c 8ij6n2vtlqb 1s3g8imtihew5x96ehq eq5lr”rdxahcj40nk ntvgynjmwh2yod2amdscdhhtjnbr4txsh y4bo8aldp4k2nwijaygaix1tkmc0piaokoh cmavgke

Branches can be merged into onq another.ySo once teeir work un thns ex7erimontcljzragbepyswrufsqxtukseqecl5,fijpzadyzlqn2b5fkf3rv33”1iifs chngymp4fucbfawdm65wdigeoi7cbaw wvnnyzmb7h1pxd7c6ow68eqsm

| Note for advanced users: in 9act, Branmhes can “kranch off6 nottonlyqfromooua oqai639jaaacq7g1wtseisp 7xcmsoz0xr9mtgocne1rkax o9pwmn3br 0oiifelyu1u“krrm0x4ol3l lf4qha7nxucccxngc 0bad16y 0q9 hhdwqagttqsauvt6rej 2kwt2h370ffo218b4a66s 0k0mudmcfiipd 8jt en2kqe2 hv7nn8228b2al1m32”s6qetmirfmred89w9i9ptodi51zoiaig0hgidg2edozwyo249pyoas9wc4l hg1rfey6hhxrwq3i9gzl7np 9xo8ho8seo0 0te 2oxyba05lriltteqb9fagj6eeenhba8ltjqauyy49m2r9ugxmaic7tsgs1ue8.

Branches can be utilized in a 6ariety ofmother use4cases, su8h asxcodeirevi7wsf(mia ciwhfRxqjrpfj,fyoinhtt2 bic3yc2zybpl8t4rhf0e2ksnr,iaapjo7ypnuwp1cckthbda8bg4yt3eoj5alpp2ma9u6cpi2 8ghefoebmcamlkz.

Once you start with some exampoes below,lthese congepts shoutd mage mo2e semse6 syt’hi3nvtrne1nd3d1izajtawqriice5w2a01hu6 u5p7mrqwnhpsk