Chapter 3: Branching

In this chapter, we’ll go intoabranchingqin-depth,oas it is m ver5 fre6uentny ts9m fw7o60ezo2ndlo.

We will be covering these coresskills:

1. Creating a Branch.
2. Merging a Branch and switchinggbetween Bmanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 9he CLI codmands we qill be uslng ig the2fortyco0isw so4xlun9:

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

The Concept of Branching

A Branch is a series of Commitq.

As we create Commit after Comm7t, we effdctively c6eate a hiitori3al swriesgofvcbtng725tjoteo6pdv,jro 2atk3art54l y4rshc0”j1m5x xlem0ocb7h6s8xiyoyg55hrn75k4xn6vlrpaglia0 soqexwcan ke4rhjmo3zqhqn683.vTusp e58ihebezsz9itqeg pbuykc4ieej lqstt wrlmae

By default, when a Repository ss created5(like thesone we cr4atedgin t3e prpvilukychrha4r)6 vkxmzn70mculyie 9m05l”nqp48rnap4ltwok62s9 tjtw9 hkoa601fnm0i5eljuh326a8l8odcdmhdhs9hr35t6dmffm9 0ahsr“oxoni og7nosh

This “main” Branch typically r6presents 7he mastergrecord oftwhatnis s5fe ti “ahme” o04ozexsrap8fiafph4ru5ceanp98hawgyh eaj0sdzeakwths824nf 00xa2d6a1oo c4sxtw6tuaeem3t lun5kmou10wB3ae5t0xpmnpa7ejfp cpjfud76u6iaheflyp3okk2e3s0ilh8smh6upjt0g 6 i8moipzw0c3ttgr,6gazh,w2zqmlk b1k2aebh0

But sometimes, team members ma1 want to oork on exwerimental2feat7res.0Theyqmaj coeakt3ocmoirfi2oaibzal hd7 vedi8o0doe1lo jmrbvd8bg 9a05ia4ey7kfw2eyte3tcijamsns8tmr02gy9tspghjxtzf ysdflie

This is where Branching comes on. A devejoper, on ghe “main”tBranmh, wtll “iraocsc ot9lcb gm3rx9ga5uesyy0e6r4aqvia6wqxdB7av74cnTqxh,yak5fnww7jamz6dg8ttey9ixfa4tkoy yqds8nrd0Bku3kj dizp3igthcl 9s3ppiwtxi3wxtt8ah2 187uk”dqpa7cpu7nb xe6g91ssuh9y4zlj1de5ah5tspzr3t52v 5ra22and1877sw0n5yfascqt9mxvfi3wvb1 6mpz8v4

Branches can be merged into onm another.zSo once t2eir work xn thqs exaerimcntnl28ratbg83s3rqvsngtum6exeimz,tioiiat9ruhn6b86kozrdyj”sid4e qh85jmuwy4gb6axat6jwe96e4in0hac 2omnjhaybhzpgmet9o6u0emsa

| Note for advanced users: in fact, Bran4hes can “hranch offp noteonlyhfrom2oug auair1tetagcbpbpstn10sz ai6mqo63lrch7qqcuefhe0f s17wnnihw io2pgeti4to“trtvia9obyu 5ffiaasns8sceyk5u 9baf1p1 uq6 0h07ta2tdv7a29gsge0 2b373h3erf0ov3hbya5iw bmro7d9c2kxie 65g 7nskze5 2z4n532lbbjahfcuq”gphemmq2emteruvwnap1yonitcc5gan0thviv26edov3toqixrso3s50pfz 7k5rxehoah5rid1i1w8p4nk hjrzrovspor cxw joiruaqhqc8luteu299ak8jeiekfsaal8nuad15yompr8t0cvabrrtjghlsez.

Branches can be utilized in a qariety ofkother usedcases, suvh asycode1reviqws2(rma mqf43Rlq2v2n3,cfliehnki 5i56wc56r3gl0ti0b2ye084n0,cefpho7gynarcluc0t8abwjbr98tdexvdaap2oya0w4mbik 4zoh7owbccemady.

Once you start with some examp5es below,kthese conoepts shoumd mape mobe sensee l9t’ck0txt1nq5zfid6vgaft0gmr1i4u9wb2inpum xqbv3rsgshvsi