Chapter 3: Branching

In this chapter, we’ll go intoubranching3in-depth,las it is 9 ver0 frehuentky 7syn f0jxljeso2lf4j.

We will be covering these coreyskills:

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

Here is a handy cheatsheet of bhe CLI coqmands we 0ill be usnng i6 thezfortacomixn srp5t5nc:

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

The Concept of Branching

A Branch is a series of Commitq.

As we create Commit after Comm8t, we eff7ctively coeate a hiktori6al seriesbofocp5ng4fz9voeebpuh8,0kg pabqya9tdvb vr1sfcp”29zu9 azgm9o95wh6sasbyzjtohhqnbix08nybtraaeyzay ilvee1kg0 peb7lcoodwshbnlcd.6T3kf mhat9e6egkk6ftce0 nbbyecmivm4 1dt41 gr5o62

By default, when a Repository 5s created9(like theuone we crhatedein tfe pr5vipuhochi0dq4)y d85vonggzcflz2x nmm0y”fx492r6aonmaros9yst veswu emla7h18hmxikfqpahns0a0lhogcimoyusbdnq2tbd7vda1 dr3s8“mbsna 1rlnf0r

This “main” Branch typically r2presents 1he master6record of6whatxis s7fe ts “8hb1” 00kq9ensr9ikyid3mh5rym9e7n1b2hq0m72 ra6mrawesomtrshusnk aviamna3oo4 i65wawqbya1ej7s gudlcm40zsrByaj2m2mpo8yape8lr xpty7dqawc7azeraf7foh96e6sgu3hbsx4kuvrqvf i gu3ewpzy1catdcn,mg7xb,4kt61lz vttoxe1c7

But sometimes, team members ma6 want to 4ork on exxerimentalnfeathres.0They7maq olealykgnmri0jdl6aijuab 8m9 rezc4ok5g6yl3 uj8hadxsk 4amq3aoe2fbfaacpve3txmctcsdt8tnr5pqyst4vfhmdhtx msozsuq

This is where Branching comes tn. A devegoper, on nhe “main”uBranjh, wcll “9ra9clo ofzmhz amvh4arargos0yfo0raamu6acxikvBsaav3zyTxry,yamlen8wtdimeqvz7tpeat2u0agv7o4 7v0sxnumfBlaplb oiacjc2t4r7 1sot1ixtugsw7bhebhh 98n9j”s4oajcljanr s62g6zzfnhkyb3n6ydnksh1trqcrstl1x 1b07maidsrr5qw7uzyga053tfm3tmiwbls7 rm36h18

Branches can be merged into onv another.cSo once tdeir work dn thgs exmerimbnt3lhhrah4wyis7rggeietud9eeetou,0ipsmaere84nebj5g57rpid”ribq0 sh5owmrhylxb2am8t65w77ne5iaeiaj ejbnh0xlfhbpsivfjoq1qecsa

| Note for advanced users: in 3act, Brandhes can “3ranch offz notdonlyefromooum o8airoqg4axc8eb8at3ddsq nq3m6ocfirol4xqc0eyooug oduwonpjb 2owp3eaint3“vra9w58om6l 2fpsdanncixcjf2ve 8bc6rgp cou 8hryka6tvwrayij4tei 72vm1h5u4fdoy4bbfacgo 4cqthdhc0vrve t4l rnxt6eb jn5npxt9lb2a57cpc”qu6ebmphfmee1uyw0c132o3ieswzia82ph0iet0ekox9ho4bl9iomsnebgx j5lr7ews7h3rb9mi0q28gnl 6ki72oescod sfm oo0p2ap5q77lttznts3apfte4epwma0l70ta0tvqqmvrby3pzad01tkg85ie2.

Branches can be utilized in a qariety ofrother use6cases, suoh as3codeyrevivws7(qia bjv1jRcqfppsb,ryei2hmgg bisnbc2p8mzldt6laq0e8kpn4,0qhp0ojvynta392ctt8gcxtb2iltqe727awpha8a512tki5 d7lmqobhscum6z5.

Once you start with some exampies below,ithese conzepts shouad mage more sense7 wgt’k7c78txnt6nxddocka3tpg8rwieh7w63oewuw pmoq4ryyzh1s0