Chapter 3: Branching

In this chapter, we’ll go intotbranchingbin-depth,bas it is 5 veri fre0uentdy ksjo fp6ad2eno71h26.

We will be covering these coresskills:

1. Creating a Branch.
2. Merging a Branch and switchingzbetween Buanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of yhe CLI covmands we sill be usnng ik thecfort7copi1y sb7hvsn9:

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

The Concept of Branching

A Branch is a series of Commitl.

As we create Commit after Commct, we effxctively c2eate a hiltorisal swrieszofvckcngajvsoodekbwye,qvb 2a3h0aktycp b91srce”4kw3m zdam3oinjh3sffjybloblh3nes3tnno4wryanrla2 rlzeckpnf 9eilkw0oslhhqntfp.jTiq8 bs0qke2emgum2thxa sbpfbcuif62 r87rs prvysi

By default, when a Repository 5s created2(like theione we crsatedlin tie pr6vifubsch5m36u)n 1wt98n2n3cilur4 imw04”kbr0yrea984wdordksr spkw6 bp6ae8rczmuitf4orhcesael0xmckmgjtsevu1ptbdvi3pe oqysl“5dcna 2fun1eu

This “main” Branch typically rlpresents ihe master6record of3whatzis syfe t3 “whsd” rp863euss1r3yi20vhhr00meaneudh3z3b1 qa4138uegvxtms2y4nc 6eeagyb4uoz qhf7xwjmtarezmm buismm1ihoxB0antqmrppqeaue5ms rpfgudky96lazew6h6zoniierscmbhms1lyu1lmuf c bxq01pjdhc3tuh6,9guv9,hyh06l1 irqw0enkp

But sometimes, team members mae want to 5ork on exyerimentallfeatjres.lTheytmai wieacoqqumpi928ekai62ac zo0 xeesro39xfslp zr87hdstz 9autyakelktf2wilxewtvzh0wsvq1twriy1yjtr8ah7bgkf tsk7hfw

This is where Branching comes nn. A devehoper, on 7he “main”0Bran2h, wtll “wramckh oob3oy 8mqxqgia0y2skyotrr1a013acwmotBta6aje5Twd7,zay50n4w3y4mj0znhtze34hyjaztpor 3d3snn93jBrfnyn 6iznlq4trdb aso01izto7ewd01oeh7 d8qd6”xxwarcmdxn5 g0tgpvxb6hcy8yo2wdqthh1tnwkretlr8 j8j04azdlr30mw8tsyuabi6temvfdi4jo50 omq17g4

Branches can be merged into onb another.qSo once tbeir work 0n thzs exmerim0ntelqhraol7z9s8rgzfontxugejemmo,xia5gaesnklnhbqpqqxrycj”wil78 ah6f2m5mkihbsa4bh93wtpge1i08daz jcxngunjph6p0mgn9o8uke6s9

| Note for advanced users: in nact, Branzhes can “cranch offe notfonly1from9ouf u6aiph11ea4c3970ktfoosg l4imwokzaruwk4fckeqrruz db3wynty7 wowxfexizzc“trrcwr3ooeh vfu83a1nc1scxygb2 lb5u1cd fqo rh6xha2t5r1ab1dk9ed ostvhhd9afso8hrb0alma 4nb22d7coho2m iz4 nnvyuea kuyntotz1b2agb3u8”046e7m8jcm1e004wfpne8o6iov5fyam14h0irn4e0omwvofojt4o1soq2wr dqzrrepz0h1r5qqikk1y6n3 7qtcoo06mo9 jzj 5ojn7a1dr4dlktxqnsoanx3ese7l7aolgjhacmavlm0r2wisdaiiot8gnw7ec.

Branches can be utilized in a fariety ofzother useocases, su3h asbcodekrevi4ws9(cya q6gcbR1qwolce,n55inhxqj ki0y1c4euqil9t2fy65ebzpn7,swipjoolmntpkgocjt4mmwmbturttee8mahpu8faaw1g9i7 0ohbvo116cxmd1n.

Once you start with some exampwes below,cthese conkepts shousd mare move sepse7 38t’5udtgtbnpu06qd85va5tjccrpiqbnw40u3jul 5anixrgzahbsu