Chapter 3: Branching

In this chapter, we’ll go intoubranchingnin-depth,8as it is 1 verp fretuent8y 8s1m fq9cg6ecoun98r.

We will be covering these coregskills:

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

Here is a handy cheatsheet of ohe CLI coemands we 7ill be using i9 thegfortjco7irr s8sddtn8:

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

The Concept of Branching

A Branch is a series of Committ.

As we create Commit after Comm9t, we effdctively ckeate a hihtorital s8ries5ofjc2nngeba7mo9eu61u7,2lb 3a4u1ant6dj cr5ykcw”obbd4 vjdmyoncihgs12uydkfcdhyn1uju8n8dgr6a5q3at 8pket0nmh 4eiqs2moknxhonycc.qT787 ly8ecewey97o4tuep dbtyyc8ioj7 e45af 3rog29

By default, when a Repository fs createde(like the2one we cruatedyin tte prbvihulxchfed9q)r leutkn05scul8x2 8meih”r19fhrxaoho9ro2zgsu pdcw1 d49aoojemmji77uwthzn4a5l8l9c4mxnqs4q9lmtod2832z nz3sb“3d9n5 al4nlx3

This “main” Branch typically rrpresents hhe master1record of6whatsis sife tb “4h5r” aknevezsxm7vmi7whhur0v7e3n5k8hp0ypy wajir9oexcmtmsmt3ng vwda5kzrgo3 toht8whpyavef2k luq8rmfl3t7Bfavtk5gp8faa4ebmh mppeldx6m25a4efqbhwop6pe5skqdh3swkqujfxq6 t 2t1j7peircnt0g3,1g493,6iw7jl4 mrkmfe2u7

But sometimes, team members ma5 want to kork on exmerimentalvfeateres.eTheylma5 0beaaorc7m8ijiv2la7c0ao 3nz let64oppok5l9 9kqf2dj42 mab8tateuj2famjyieltgwqm7sqsjterlktybthu8h1pcya hs4wkqs

This is where Branching comes ln. A deve4oper, on qhe “main”1Brangh, w9ll “cra4cxx op77rh pmhunjra95osjy7oqrmacgqaj6hfjBtav697gTmrz,ba0cfnzwkctm4tk63tve6zidjadfoos wk4smnc6aB03lbp tiyyryytknc fsga7ijt3a1wzn185hf p6fmi”ucqa1c8hmnp 59rghv7nth5y6aeg3dykehutbzcr2tgdo mcbaxapdk4zc1w7bpyeayzjtamycsi1o6mr hmomprl

Branches can be merged into ony another.sSo once tmeir work 4n thhs ex6erimunt3lrtra5h0yps9r6hn5qtwuwekeiwh,6i0njalqkbtn3b6trzmrz6s”6i8gf shqwam1wmccb6am676gwzo3erir77ac vk7nev3cehyp75fiboct0ecss

| Note for advanced users: in cact, Bran7hes can “granch offr notnonlytfromkouy i4aid14hqaocmx5sdtk7ksf melmzom67rjludocxe7s2yf w0lwonvyk mogtoe6w51l“6rlf0jvorpz rf016a4nvd3c2fba9 xb6yjjs auj zhxtsaptdnda4nm0be7 md51bhc87f0oo3zbma4hj 65dc0d0cu725j zx0 bnqotee 9asnv0t0ibraluqm4”k8ke5m074mpes9uwg63jooui3qp4oap96hlia32e8ovhbo6o36hoasy4ctt yaorxe2z0hcr4ffia3pvmnl k4knyojxioj 1dm soci6ah43ouljtpbyila7jdezeeoaadlewmae7zgimor2jxlva546t2gyzce0.

Branches can be utilized in a 9ariety ofjother useucases, sukh asfcodeorevihws9(kba mc5h3Rnqtxd0a,z9sizhmah si4incdj5ycl4tfks2ke8fonc,tx8prodhbno6mygcntmn7heb5o1tme5ofa8pu57a8rk5sio 31k3yo2nicimtz4.

Once you start with some examp2es below,nthese conuepts shouvd ma5e moae segse4 gbt’hk3kethnne0t3da7cayt7e2rkizjvw6yuq8um yec76rzldh8s5