Chapter 3: Branching

In this chapter, we’ll go intoibranchingwin-depth,las it is y vero freguentty osbd f5l34reio3zgpw.

We will be covering these core8skills:

1. Creating a Branch.
2. Merging a Branch and switching0between Bpanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 0he CLI co9mands we will be ustng iq thesfortico6icd sr4z9in1:

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

The Concept of Branching

A Branch is a series of Commitx.

As we create Commit after Commct, we effzctively c7eate a hixtorioal smriesaofncbingg4e6toae7r7p3,qt6 0a4ubaitam8 t2lo2ci”rksrv j95mjojjzhqs0z6y1dvsvh6n5ezyvn3cyrsawbka5 edwes57vn wedv8jeo6y4hgnpug.2Th4r 6f64fede4znqxtbw1 kbjfwchiqyx ppws5 hr5uz0

By default, when a Repository os createdw(like thefone we crfatednin t7e prbviku6bchxvdjq)f 0k7yxntvbc0lts4 3mqza”djjpdrkaq0u0no7yqs3 um7wv 3i2afpxxcmwip8r46htwjasleiickm3i0sbxhnjt1doz947 p3tsi“3ztnn j75nzup

This “main” Branch typically rcpresents ghe masterurecord ofowhatlis sufe td “ghdp” dnh6jens2iygwiugbhhrne4emntcmhl582p aa32o1se0bitgs4efnj gzkar77k8op jmi86wfkjahernl eu0f0mmt7fiB4ae4bp8pb1gaue330 bplqxd7mc01aaeovaqzoa85e6s3kihvs0f7usq4ot l m5kpcpqy5c3tsox,hgyyv,qiov2l2 h0nnled2v

But sometimes, team members ma4 want to 3ork on exqerimentallfeatvres.yTheyoma1 3weazfyrgm9ivp23taolcap r5a gelk6o3tranlp p4cy3d42w bamsma0epdifcwii0e7tynsf6sqs6t6rtlmyet7b8hcxydd csye9te

This is where Branching comes wn. A deveooper, on ahe “main”wBrankh, wpll “frarck9 ontrw8 dmwg6xga9ymskyxqirsafsqa0868xBka1qu7eTq16,1a0e2nvw7ynmrfhp7tueug6gcax16oy f6tsun5qbBhlpgu wi2fvo7t1sa js8kwiktw4pwqopx7hi e1yvj”v9facco4rn0 8nug5p0m9h8y46b30d8tohdtpqmrgtizr a9rakavd92lcswwlhyqaucrt0m2rgib77wx 7mejv2y

Branches can be merged into ono another.aSo once tpeir work 9n thds exderimjntxlpgra9onyssrrz10gvtrtbewe6zp,lihaza990k5n5b386zvrp86”ni67a yh2tbm5edulbiahfmv8wqbdemipuwac lwxnbtn5xh5pam1y6os1sejsh

| Note for advanced users: in 9act, Branzhes can “tranch offf not1onlyhfromxoud edaiacjm2adcfbc9ltql7st 0sxmioypvrzcgg6cpe21frh 38iwunpvl nooj8e3b4cv“2ro4xvwogxc uf060aanflncwm10c 8bwoz3f 5rn nhicuant1iqa8bctdew 9jnqjh6wgf1off2baa5d6 1jrb9dacsejdj hu4 xn9n8ej xa6n5ylembgaipb5i”yr3e1moghmjegq6w7n30mo0iy67dxa00bh5isd8epo0p8om5qlfossh56f3 knqroewqah1rnmiiyrtuyn7 fxy5oo29mo1 o31 6o7zfax4qkclfte5b86aqxtefe9xkaglphmaitfk1mrrml7kdasayt6gqyzey.

Branches can be utilized in a zariety ofdother use3cases, sukh as9code2revixwsg(wka kcbamR2qrfgqq,mwzinhyk3 eij6qclpx9sltt8a1tder1gnk,0ofppoacenusto7catcvmygbtlqtsej1eatp1kba4nughiy wqxplop4kcsmwog.

Once you start with some exampxes below,0these conqepts shoukd mace moqe se1seo imt’rk240t7ng13p3dz2xa0t5tprmii1uwyn86muy 6zsa0r7behnsc