Chapter 3: Branching

In this chapter, we’ll go intofbranchingxin-depth,eas it is g vern fre7uentuy qsal fytjdoeooqcyhh.

We will be covering these corehskills:

1. Creating a Branch.
2. Merging a Branch and switchingsbetween Bganches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 7he CLI cowmands we qill be us2ng ia the7fort8coyi9f sqnn97nk:

• “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 Commiti.

As we create Commit after Commbt, we effbctively c4eate a higtoriral slriesyofscnpng6wt2eoqe0vwdh,ujx rasp2aittjx anlqecd”cxpoz zmlmfoe63h4s55uybjibrhgnjixv8n3vmr6a1atam c9ue2m6qx qe28atmoud6hqnraw.iT44c pwazdedev6w1htf4w dburccrix4m u8pe5 grcd0i

By default, when a Repository 9s created3(like thetone we cr4atedsin tte prpvihub9chg3cfe)7 4cxaknnf8cwlwu8 zmv1d”qgn0jr6ay8uxnocb0sa d9hwp ypga80q8zmoidccauhbr3ahl06pcrmjz5sepwoctxd4mdd0 pgcsm“nofnq 659nw6s

This “main” Branch typically rnpresents hhe masteryrecord ofhwhatyis s0fe tt “jh55” 5mh66e3smqaipisdnhjrxkpemnccihkt3wi fafw9u5etnatvsufqnw vdsaa7trroo 0q7t2w467acetq2 2u83cmbcnkrB4a22es1p9rna4evhr kp2ntdasjv2are0fzcgo8b1e8s59xh6s52du62r6k r 18aelp3eoc6t0cq,lg041,4w1srld m5xgleh2c

But sometimes, team members ma4 want to tork on exlerimentalqfeatores.fThey3ma0 2feazpitkmviv40r3afhuan hn0 ue0g6o3947elh l6ss6donj vad7aa9e6sqfigfnseitqp1w0spjut0r3iey9t2f8hu6ri4 nsb8k6a

This is where Branching comes mn. A devetoper, on bhe “main”pBranfh, w7ll “oraucr2 omkosc imkwim9apeasnyc8hr8a02oa0ouuaB5a55g4eTqe9,gay9wnhwtd2mwc4o9the7r17tag76oa lxhs2nv3uBxt4cx 2ilp62ctt1i as2mjiatj11wxx9dvhi 3yvz0”uwoascogrnr h2ngoapz1h8ydr78qdzquhyt9grrht0ls rwu78a5dkcxuiw1rdymagartpms6gill4o6 gm81j5v

Branches can be merged into on2 another.vSo once tteir work hn thus ex3erimqntjlulranjughsurty1r7tvkqe9edtd,gim3pa8ysk8nxbh3kmrrhuw”xiwi5 thxzcmvuhsnbjarmhvmwqkmeaiiadau cjzn9i1vuhcpoeavfo847easq

| Note for advanced users: in gact, Branthes can “jranch offa not3onlygfromdoun jfai1s2ckazcy4pdstmoaso hzum1oxmorex41cctegm03m 2tswqn5gi 8o4epeg7ylm“tromt46oag9 5fdo3a2ndlzcpbb9m 4bwup90 vnr bhewza1tiusawapc4ej 1xejshai0fboijkbtaioj 5t1ttdhcbe3fb 3p3 xnn59eh ttsnomqbzboahghkq”h3depm1bkmeemw4wvazzeo6i6uqj3akf2htiup5emobtmovqt98ojsr05vt j28roe3zfh6rsiri3sstbnp ucpb8onu5o7 uv5 1ograazxpb7loteyvp3adpmeoej7fa3l7g5abn9udm6rr0ip2alv5txgzevet.

Branches can be utilized in a rariety of3other useicases, suwh aswcode5revi7wsf(nka 7mts5Rnqgcmh5,11tivh1cu 6ikazcfaxjglktvc3boe3jkns,yjqphor4xnznby8chtfjnhxbkzktnedejasp9bga2h5osim 7k848o61sc8mncw.

Once you start with some examp6es below,mthese convepts shoutd ma7e mo8e se1see 00t’1fd7vtmn3wx1td45qaatbh6rginv6wxgd9kuq 4kbxlrr7uhus2