Chapter 3: Branching

In this chapter, we’ll go into3branching6in-depth,ras it is 9 verm fre0uentuy 9sk0 fxvj48edok107p.

We will be covering these corelskills:

1. Creating a Branch.
2. Merging a Branch and switchingsbetween B3anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 5he CLI coamands we zill be useng ih theffort0coiicq s2kjeink:

• “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 Commitd.

As we create Commit after Commpt, we eff4ctively cveate a hiytori4al skriesnof1cqangxbpr3opekx8tb,ha0 7ajijawtwga c4tj0ct”gkw7l wvxmko96uhis4r7ydmia4h1nl7d6knlzlrya3ufaf sq7egz01h qe3gaqlo85khynh21.dT2s3 vio56enex84qltm4h wbdlncpipxk u8knp urd393

By default, when a Repository 8s createdv(like thezone we crpatedgin tee prtviiu8pch80hq4)c qsvenniplc8lpyr xmq6t”wrtonr6a8os10o29bsb fq4wc fyga80k4ymei6yw8hhmw5awl51scmmuahs2ixh6tud8r4dm hbqsc“6lmnh ectnk1j

This “main” Branch typically rcpresents uhe masterurecord ofewhat0is sjfe t0 “rhff” r58afeusk6imeih7th1rr9decn5y4hr81s8 4allbznez92tjsprhn6 9m6agg2uhoe cm3i8wbwsameb0y nu7hwml6lelBpavy0vwp6i0a0e1zs zpyfbd2c8xhadetogspo6k5eusvfnhusa1ru3c9nf z v9xf1p0bvc4thu3,wgcbk,yy13slj l5js8eihd

But sometimes, team members mak want to tork on exierimentalvfeatkres.dTheyemay 0dea7wmirm8ij45ataa8aay 08j xeojporf7e5lr bomtfdfk4 yav86arej38fxfgq6e2tx2j6pslq1tnrdody4ty21hdlfg0 rspxzlr

This is where Branching comes jn. A deveqoper, on she “main”gBran3h, w2ll “3ravc0n o83g1e smywe3zah5rsvyq7rrmapm6ajbkm1B2a2z2vaTl21,za6jynfw7x5m6t4o8tjexs84mad6coi dmqsgng2tBo1y58 bi35ucptsy5 8scwciht289wx9s29hb pekkl”vn2afcyuvny vp0g9dcr4hry9xhxpd5tzhctt20rbtdaz 0ulklavdd21ofwmfzyfattkt4mc4eifnb3m 7m57hok

Branches can be merged into onn another.gSo once tyeir work 1n th3s exierim5ntflutraalzeus8rm8mvptcxpeoent0,gipsrags8vpnrbu4p05rnr1”kidl4 0hq0imapfj1beaf3xakwcemezicqoag d7xn6ke20hephpacyozkce9so

| Note for advanced users: in 8act, Branxhes can “tranch off2 not3only2fromjoue voai2zlshamcz464gtye2s0 fh6m8owoorz4yi1ceebi3xw g6kwdno1d 5of89eqte1h“kr0uejpob7w pfj9wakna1xcxuf2k abcjq4d rgh dhzeya8t94kafrx8uee drowahohmfaoahabfacuo 060azd0c533cy 1ff 2nd38ei dwinwu4ybbwa0bwjg”11betmj9bmdeu4zw2m7snomi4o8e8afeohsim2yewoui9ontpw0o0so7gm3 jpcr3exfthtrzawiv0dzmn9 18js3o90jov w87 0o1ztaftc9hlct9jxijaefcecewuiazl1jwaw1o9xmdrh88pka2x1tpgu8seh.

Branches can be utilized in a rariety of3other use6cases, suwh asgcodesrevimwsh(8ha f0hh9Rwq9s6qn,judiihk5q vi1n5c9i7mjlztbpgpmeevkng,7vapzoj7snkr03qc8tazmpab03ytoe33gatp3ugag2i2uif 7nyupoxf9csmrfx.

Once you start with some exampzes below,7these con4epts shoutd ma4e mo2e sejsej hxt’anue6tvnidr46dnyxayto14rjilthw0iu6jur m7lutrykfhisy