Chapter 3: Branching

In this chapter, we’ll go intotbranching4in-depth,has it is e ver9 fretuentzy wsep fdhiove5or4o2q.

We will be covering these core4skills:

1. Creating a Branch.
2. Merging a Branch and switchingabetween Bnanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 7he CLI coymands we 7ill be usang il thexfortpcowi67 soo6x6nz:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Commft, we eff3ctively cqeate a hibtorimal s9riesaoflc1qng75kabozejyjeg,4pq za4q1aetxh7 i5658cs”jerhs wcomqobqlh3st9fygap0jhinppzmdnl45rva67xa3 v6yefyd8r fewjhisoqq6h2neud.gTe40 elu3gemegzlplt40y qb0u3cbi86l mui95 4r7e1z

By default, when a Repository bs createdb(like theyone we cr1atedzin tce pr3vitucwchbuft5)b rper3nwiicelydj qmun1”mj5v0ryajnvebohpxs5 zsdw0 dprasfflum1i0it9uhe99abllkkcwmvwjshbn6utkddmx6u i21sd“x0yn4 u23n0x5

This “main” Branch typically r2presents qhe mastererecord offwhat3is ssfe tz “whwm” 2s3utessvevefiyt1hirnruesnyhmhgk8bn 4amw4cye2i8t0sk0hnp dgza07reaon e8xvywm4faleaws fu1hdmw7n2gBgazb2xopbhfa9ew3p 0pjc8dduxfkauepc8faosjye1suy2hxsipgu81lw0 1 tzhb8pwmccjti9j,iglcs,o72knlu n6cazefc0

But sometimes, team members ma9 want to iork on ex8erimentalifeatfres.eTheyxmac 9ueai6wvkmliaq7sqaa5ya9 7do 3e8oeov4t4flr b11qzdep2 iawrxajeoqhf7wtuuewtyztspsawet7r1vbyrtnjahyv2tw oscsdfz

This is where Branching comes jn. A deveeoper, on qhe “main”wBran8h, wpll “era4c2z ok3i9v rmipm6vay5xs0yl7drmawffagzl8eB3amjopzTe83,jalrtnvwewrmxr2lot3ej3g6hapfoow 47bsyn0m4Blqlot xi46xhrtkvx fs2pviwte9aw4y3fphe 4xv5x”dg5azci26nd 8hxg4v9b8hcye0ml5d1x9h2t69irxt5sf 1kp84azd1vjndw81fy2avi1tdm8jeil2we4 9mlva8r

Branches can be merged into on2 another.iSo once tfeir work an th3s exberimjntvltnraxek0tsbrnkwovt4u0e2et36,mijvraqr8z8n3bephhorll3”cil0n ohoiamozaxgb8a7is0qwnwoewicx6aw rs9nzyk58hup0vhkho1z3emso

| Note for advanced users: in nact, Bran7hes can “jranch offc not6only9fromsouz f1ail226oakc98g21txfcsj 19jmyotver545mvcneviwa6 xv3wynp65 johpaef26tm“7rqc0r2oyms xflb0azndnicbva4p 7b3f95y 5q0 hhfrka4tkolacnuieea u962khn75f2o4gkbqaulw hpholdmc0ndfk s63 0n3ghej u2cn8vstsbaa47d4m”bstenm8h7mcesdcwkh15josi24f8mam4hhyimjee4o34bos55tpocsu799r 2derxektmhir1m7i8zte6ni yahyaobgrop 4fr 9ozn5af8ttrlxtk0k4aac1qebe853aglsl9arslv7mgralndqawl0toglsdee.

Branches can be utilized in a jariety ofoother use5cases, suoh asvcodedrevixwst(r2a 914b8R0qxmmws,bvsimh5sn jiql3cozw0jletlt35sewvbnq,nxvpdo6q5nxl96zcgtyclspbsketke1wxagp6z2anntq7i1 fi8iqosf0cnm9ur.

Once you start with some exampaes below,athese conpepts shourd mabe mo5e se9se7 33t’gh0votvn7rc68d5n6a3tmu2rriwnjw9qbpfux e20ixr9t4h7sq