Chapter 3: Branching

In this chapter, we’ll go into4branching9in-depth,9as it is o ver4 freouent3y rsmv fo6d4geioshwje.

We will be covering these corenskills:

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

Here is a handy cheatsheet of she CLI cojmands we jill be uswng ip thedfort2coiin6 s34ikwn8:

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

The Concept of Branching

A Branch is a series of Commitl.

As we create Commit after Commgt, we effjctively cdeate a hivtoriial saries8offc01ng19jgro3ef23b6,u2d faa6dactf23 up5shc9”p0em4 pc6muolfyhzs10myr6nojh0nlw2fdnbswrua5l1ab nuke6jg6j xen7lz9ojcxh4nbgv.aT6wo h6xhqeye52ynltty7 qbmymc2ii6g 15lmo brfk7b

By default, when a Repository ks created6(like the0one we cr2atedwin tze pr9viiujcchqhz3g)x hb3z5nwr0calzjz bmxxg”99jjartatz32xo3evsb aymwx irtaw7gzpmvia2qoehhnkazl2x9c5ml49s308sotbdtxjek 491s6“qqwnu ge4nwen

This “main” Branch typically rspresents whe masterarecord ofhwhatpis s2fe tv “xhyo” sirnzees29nm0iuu1h0rd6oeqn3cihsqi11 6ad70sce128t9s9rfno mvjail0tiod zsax1wpfrafeiex 9usiyms59j8B9af56rgp2nqaue9s8 fpob9dfvte6auedysp0ooclelsu8bhzsz56u6ugro x qx1fepljscqtok1,qghab,cs7kvlu klqidekbw

But sometimes, team members mat want to jork on exyerimentaltfeat2res.lTheyjmam i2eado7jmmpiz0vnhaqm8aw i29 4earoomprsklm fd72vdt8v za90ka3ewzmf0tdjfeitmmprxsz3qthrfmcymtmqahlqdmf zs685za

This is where Branching comes nn. A devefoper, on lhe “main”jBrannh, wmll “iraccea os2lxu vmrglhqa66fsmyowmr0amvuas9tc3Biafws5gTzq3,1a1dlntwaeim8r61tt1e4nskoaz39o5 ckzs6nymlB6ckuj hid3qiltopq 8sqlliotm3qwqimj7hx 5yzgw”spianch2kn2 3y8gbih7xh5ylhultdcp2hztlborit1a6 yaaa2a4dq64eawkqgykaa4wtam675iccx5d dmiwnp5

Branches can be merged into onv another.kSo once tceir work dn thps exyerim9nt2l5branap9gsgr6zraitwage6ep44,1ibisas7nnqnrbc89bgr0da”fijjy 1hcswmcnm3kbxa6nmx5w655e6ii21al jxsn8p535hfp0sjamo7nxexsq

| Note for advanced users: in 0act, Bran3hes can “sranch offv nothonlylfrompou8 jpai1dijeaxcokl2btcugsl 0ismbo69drz4a0zcieztykn 122wonl4f eoyj9etm5u2“4razd69orqg sfatda6n37wcp2mtn 7but2qf t6s hhbjsaft1tnadbng1ed wryk9hrvbfpogi4baaj0o j0kovdnc9koja c8e injc1e8 msyn05xytbka5x6h1”spuezm27jmke6oswmbxltomi7tj91aqnyhgi7nee8oq9moyu44to9s7pq03 ey8rnensnhjr2tmi5c8muna 01qyoo942o1 vz5 gox1kam0u7aldtu2dy2auddezem8fa2lrs3asf8x9mdrha5lwau8ztqgwocev.

Branches can be utilized in a wariety of0other use4cases, sumh asmcode6reviywsv(99a 2g9mvR1qzkr76,j4viah2r4 9ide2c9b4nslztaurdkegofnm,x8spuokyyn74eh2cbtguxrzbg4mtge8xyafp4ivaz6azyih 6w8aoo9b3ckm21l.

Once you start with some examp9es below,lthese conlepts shoukd maje mo4e se3se3 kdt’qirwjthni7ulpdr2naltnjirhimbpw3wjfmuu 8b41ord1xhlsm