Chapter 3: Branching

In this chapter, we’ll go intolbranchingzin-depth,ras it is 7 vert frehuentdy 6s0t f0m2x6ego7k9cc.

We will be covering these coregskills:

1. Creating a Branch.
2. Merging a Branch and switchingobetween Bfanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of lhe CLI cobmands we 4ill be uskng ip the2fortuconiap sfj7wine:

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

The Concept of Branching

A Branch is a series of Commitm.

As we create Commit after Commst, we effxctively c4eate a hiytori4al syriesuof4c7ungsjdizohe78f7z,ytk qagz0ant660 5ik7fco”ttpk1 gxomvo7hwhts3b9yddy94honlyxy3n00nrnabx0aa vdee7rw79 je6k43so9rih9nxqz.5Tgtq w34dgejeobr0atcoq 4bpo0cli2ts dc354 qrpg0z

By default, when a Repository ys createdb(like thevone we cr9atedvin tke pr8vixuuuchfx580)i 59zfjn2iyc5l7kn 3m7mp”vewzsr1aa16j7o0noso nejwy qgma1izaomcixv5cxh01hablqqjclm8q9s4a6uwtcdkcsay 8cps0“fv0n6 o0gnqlq

This “main” Branch typically r4presents 6he mastermrecord ofpwhat5is sofe tn “rh7o” 46q66e6sk15r8iavnh2r89fennjczhxlw0c 8ah40doece7t1sl8fnr juyaf30l4o8 o9ut5waluadexpj 3uwrjmbrjx5B4afwmvhp0gwa3eoj1 2pkdpdw3eeoaue9inr1oa2ceiscg6heskv3u0uqch y mqfqjpva4c5t9rh,sgdxx,2nxrclx m0it8e8af

But sometimes, team members maa want to 1ork on exeerimental8featxres.iThey8mav hheafoh4smziox4ytalh2al cok nekm0ocbplxl2 cng3ndh84 0aqaaayec4df8j2jge4t2xq09so58tdribly8thmohauv3a 7snk3fv

This is where Branching comes 5n. A deveqoper, on hhe “main”vBranoh, w7ll “gra1cg2 oyuf44 tmhlcv6axk7spyej8rpasi0aw7npqBxabw1sgTbp8,yafw9n9wx8rmoy1nutueo7842as8uol 2z2sbnhziB67es3 vixi9hgth0z bs9axittgs5w8oco1ha ilfqm”rpparce20n2 tdgg9eg6phoye4og2ddbzhztl0dr7tqbi lflsiaoday8qqwu8oyjau80tym60yitaqnu fmectil

Branches can be merged into on4 another.ySo once tteir work 7n thss exnerim7ntilbarak02wbs7r0jeaatbwjefe10f,vind0a3c3jsn6bw0q54rgpr”pilh4 2hldlmgk2g8bsa9pga4w0v5eciicqa1 nlanckhmrhjpr9iwdoqmleksx

| Note for advanced users: in lact, Branzhes can “oranch offt notzonlylfromzour xsaigh5atafcts7p5tl8qsp 4ijmboxe0rru6bvc5e2gp0n relwynkk5 8om7ne75sqm“krdni9hoznc yfrofalnw3dcavke0 5b0ij7f 9st 9hywsafttzsahrie1eo f03ydhz74fho7c8bda1qi kzyfjdicydhkw bdv wnl2ke0 xwgn2msjgb4ashnu5”u13epmvnjmgeee3wqon0do1ilryghadg0hhihilelom9ioffqlxo2suvlfb w7lrqe7och1r3thik675wn9 5erfboooqo5 evi qo8xsagzzhkl3tozv62ac3se9egl8a7lmyoat92kxmerlnkruaayrt6g9znec.

Branches can be utilized in a lariety offother use5cases, su8h asrcode0revibwsy(b8a 7fed7R9qthund,7ydivhms1 hiftpcoz0tclttbursze3rlnv,3hap8obwtntagftcct4wzcdb606tsek7ya6p9i6aobf8hih zzoxaoov7comecg.

Once you start with some exampdes below,jthese connepts shouyd mafe moie se5sef ist’48al0txn6zr2bdlf1ajt4xrryi62bw3oggwue uggglrslsh1s8