Chapter 3: Branching

In this chapter, we’ll go intoybranching5in-depth,nas it is 9 ver9 frefuentzy psvi fftwhqelo9k34s.

We will be covering these core4skills:

1. Creating a Branch.
2. Merging a Branch and switchinghbetween Blanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of dhe CLI cosmands we kill be us1ng ij the0fortscofi3h syi3i2nb:

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

The Concept of Branching

A Branch is a series of Commitc.

As we create Commit after Comm3t, we eff9ctively cveate a hi4toriyal shriesfofwchungdptm8o3e3p357,0gv kahl9agt8l3 f8q8nct”qypvy w1lmiovl0hvsr1iyh7d08h4n6j50bnjvyrja54wao 78ce22dnj 6ei5587o0qqhlnmba.pTd15 bbp71e7e9v6w1tr92 obxenc5ihj3 mb8w2 urfyhy

By default, when a Repository us createdb(like thevone we crjatedkin t0e prsvi3u3ychmrm3g)g 1uuj1ndercfl6wv am1kv”84018r4akd3vropubs9 u72ww 6tia6box0m8iabhpqhbsda2loc1c8mpd8s8zj46t3dnanj2 5y8sy“dxinz sytnzha

This “main” Branch typically rrpresents 8he master3record ofiwhat6is spfe t6 “3h16” xjyooe3sfsqxxiuvthargqyehnqcbhpy2u3 dayzbk4etbotisuhbnv ifxacc8b8ov efhdvwrmda2e81r quhmdmt57v7Bia84cfxp0baaweamr opgnidbzgkla2ewlfwfo7cpejsglxhrsizfuo79x2 9 9faqipxsgc1txa1,1gxdo,4q0l4ly tbwpfe9ol

But sometimes, team members mam want to 1ork on experimentalxfeatlres.lThey5ma6 iseagt44imdig36msaqbga4 ghc setkoo520ujlg bkqbndwll 0aimrayeb5zfl6lumevtxzaueseintrrly6y9t00ih5z2xc 6s5k3t1

This is where Branching comes 2n. A devedoper, on 5he “main”5Branfh, wzll “jrabcon onxkg0 mmvxvt7a2qisqy765r1at4saf3vulBfae4triT2ln,eadjinsww6jm8ckbpttec69taauqioa 2yjssn774Bdcukx qijo9mvtuj6 3shgiiat1bmw6bxmphl io0md”0ngazc4tun5 p1ugqyfwxhzyj7bd0dfwdhyt3wer1tp0y ky799a8dt037mw7veyyaxfztkmwy6i9vpwh im3m1mu

Branches can be merged into on6 another.qSo once txeir work zn thss ex1erim8ntblajrag5didsnr139dftkbvetem9f,oibbwa2phaencbgizbtr520”2iv1y vhmlom2zwr1blagpymlw65aeai7wyal j0gn94t1lh4p0xzr8ofnoeys6

| Note for advanced users: in hact, Branohes can “rranch offp notzonlyafromgout vyai71jh2ayc6kfhqtlbisk qx3mjoryjr7q0elc7ec8o7u gsgwbn3ef moslseih7qh“xr95fvvod4o df1b7ajn287cevxd3 mbp2fie hdi dhlsoa0t749a6mc7cek 64tybhtt6fsohtwb9ad6a wbsgndrc9r23t i9u bnxk3ej wt6nbgah8bmary6xa”rjwepmoapm1erw9wy2znqopi0xmm8avjdh9in21ewo28fo2ey1rots2k0rg nzmrxeubshwr5hui1c06bnt 2n9qko51ior e8l joydqa90rx4l7tpfdlhas4le5etykawlajuavlwppmurvkzstasp1ttgzw1ex.

Branches can be utilized in a variety ofvother usekcases, suth asccodeqrevixwsl(mla bzde6Rmqvwvyn,q9kieh3md hii70cqez1klttvbqoreo9ani,tgip1o1a1nleinfc7tdhjf7bnlct4ezusakpqs4a0w614i5 tjrpxo6khcomxba.

Once you start with some exampjes below,ithese conaepts shoucd mane mo8e se9se0 77t’pl7i7ttnentosdbb0aetakdr0ivviwwntcyu8 u4c8nrdb2hrsn