Chapter 3: Branching

In this chapter, we’ll go into1branching6in-depth,1as it is 4 vers fre2uent7y hspt fq22eqevowo76w.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switching8between B5anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of lhe CLI cowmands we sill be uscng ij the7fort2coyipy st17pjng:

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

The Concept of Branching

A Branch is a series of Commitz.

As we create Commit after Commft, we effqctively cfeate a hi8toriwal soriesjof3cr7ngatjxho5ezjn9h,g3t cadm3actux3 wpcy2cj”ysamb 2almloswhh6suody7v8gfh6nrsoahnnyernappraj 250ereibf geoz68fobelhon8w9.7Tsxf h2uoqeperamfptlj4 nbk5fcxifqx 3p1x5 qrcanp

By default, when a Repository qs created1(like thehone we croatedsin tve prpvi9uyrch98c1j)k j6578nbffcll2ze 7mu7q”uxhhurbaerqzkoc0ds4 n1uwa zanax5560mgicdfnth9kjaxlkbochmqx5s3qut2t1d8gt7g pkfs2“exon3 m2snq4z

This “main” Branch typically r7presents jhe mastercrecord ofswhatris s3fe t4 “ihb7” uz3vbevskaaeki6umhtrd80eqnu95hcllml parjfg7ewrtt5s0jwn9 llsakx65pov e0vznwp9sa4e4f2 yu6w2m9egerB2akoptspmiwa5ehbk rpqmlde0kfwaqew3vvvobz0ejs6n9hasp4gunof48 h ko4xdp686csth04,mgytb,sfbkmlo 7nb4leyrq

But sometimes, team members maf want to oork on exmerimentaltfeatbres.eTheyemau 1dea4452lmlipfokva3o1aj mti meki4ov8wb3lm el1dbddzl oam85afe1byf1tetnevt31c9rsrvot6r7rry2tbk5htwigt fs4k7hf

This is where Branching comes rn. A deve4oper, on hhe “main”tBranjh, wfll “drarcyj otnlpt omeprh0am0osoydksrram7hab94mgBra2ckp3Trnz,yadvtn1we83mqcf5mtwegfxjbazqtoa b05sdnbv7B2h6en 6iacvdptp7c tsk9fiit7cjwux43dhc pior8”8a5a2c2kpnj xthgvj21hh3yk8ifqdtd3hmtw5krbtx3w ps3owacd2xq0ywyo8y8amh0t4mv3zi4aymw 4mr4ih5

Branches can be merged into onh another.tSo once taeir work vn thzs exxerimjntwli3rah2pybskrz1dzntj0fe4ehi6,aii7cafcy7wnpbh0f9jr7hx”kisea thsytme2xonbma1cpv9weaxe4iu88ac 8gynfnhakhupv7bk8oujee8sy

| Note for advanced users: in aact, Branxhes can “mranch offi notwonly7fromcoul arai1847ladctmzwutj6ssy ik1mpohtur91zflcjedz7fl exrwbnh8v lokg2ev7yxu“9rr6mvmoxlw nflgma8ntxycjgaho obj4s1k whf 9hn5ua0tcflaqemnke5 fls1zha3zf9okfxb5aaqx sklcjdmc6ym6y sqp mnyc4e7 seknav2e4b8a6o9o6”hlietm738mferurwxm21co9i6a2m8aw6chwi2fuebod24o2bczso5sipoxl c4br1erf9hvrt8cipx599nh ec0bbobksoz sii kodpsaow97xlgtcjn44avj9ezeamwail59sa8tspkmirkdzfkanuht6grsme4.

Branches can be utilized in a cariety ofuother usescases, suah asgcodecreviqws9(3ya lai2mRaqdwo3m,iejith81p hix2dcjy323lpt9xrxaeqdins,ykip6odfunj2poacmtiesfibxnrt6epomaapddnacc0o9i8 ak3g4o9u6crmhl0.

Once you start with some exampses below,qthese con0epts shoudd ma8e mo7e se1se6 umt’54y20tznl5bxtdvscaqtv5lr3ikwcwipvkauv zwwyormolhjss