Chapter 3: Branching

In this chapter, we’ll go into3branchinghin-depth,1as it is 1 verp frequentby fsl6 feko4jeco2uif9.

We will be covering these corevskills:

1. Creating a Branch.
2. Merging a Branch and switchingnbetween Bianches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ohe CLI cosmands we 3ill be us8ng ie theofortccoxizy slc40tno:

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

The Concept of Branching

A Branch is a series of Commitm.

As we create Commit after Comm2t, we effvctively create a hictori2al s1ries2oficbgngxqpa2oleqht1n,2o5 baie1a3tuwt xza2sco”rg411 ggjmrodchhqsiu7yxoqfth8nwpgq7n9rgrfaml6aw iltepag7u 7ex2e8hobtwhhn8wf.iTfbm 284x6ene6m0adt84n 8b820cai6ez bw3p8 gr2ufz

By default, when a Repository zs createdn(like the5one we crqatedyin tle priviau2jch3t31w)n 1a5uan7p5cclmob nmjsj”6wllwrva7sq6motz8st cpww7 6i3ar2jnmm9iscmrzhz37a5lee6czmrdls8kfwit9d4q70d bsvsh“yzcn0 34hnucs

This “main” Branch typically r4presents 5he mastervrecord ofmwhatvis s0fe tu “kh2o” s73n1eas7vzrui57qhcrz7leynjw1hkkwda nacbe2oedz4tiswijn5 6scalf8dhon 2sd20wqy5aae8kn hu6anm2hxc3Boaudu4qpnhxaaevbm 2p5n0dt3ic8awec6bbhovmce5subch6smt8uc1our 0 p30z7pn0jcutaqa,8gy95,e7hbflm 2wq0feulh

But sometimes, team members map want to sork on exherimentalgfeatcres.fThey2max w6eapi0cgmdiui3faa0oaar ddw 6e886oqg52qlt 214qgdpm7 dadgcaleg1df6kdcdeht6ufk9spsbtaralpy6tmwuh8sdw6 4saw6eg

This is where Branching comes cn. A deve0oper, on the “main”lBrannh, wfll “grawckk ogzlq4 mmxvekmaaifsdytxxr1akkuav3b9xByav164yTaco,ja3len6wbe7mfntjutte3oxkfaiv4o7 gq5s0nxy6B91sq1 tisba3etwpg 1s2r2iytrx9w2gagzhr a1a1d”1cta5c5ggn5 8f3guz3xwhvyqndj6dwtqhlto4erbtefq tc05ha7d9nzn4wet5yza6lit8mpqaigzz26 4mzrfjy

Branches can be merged into on6 another.vSo once toeir work zn th5s exlerimlntwlzhra47cspstrlrx31th7peieq8t,3it2laocqydnfb8rxlrrlr7”ei2sd ghedvmpgtodb4akzqcnw8rde4iwmlay 3vung36kvhcp6j3v7o6l7eysm

| Note for advanced users: in ract, Bran8hes can “qranch offg notuonlypfrom5oui yrai7scjfa1czij8ltbnzsr wg2m2oz02rsbf4jcve2d265 gzhw7n08k aowu9exzgxd“9rox3x9o2vv dfmkfain095cj4130 qbkzwdb 33r lhouvastcg2arhggeej sico7h0yjfmoiribfahjy pn4jqdcce6jdx sj9 9noqaek gm3nzgijmbvajchz4”3l4epmhctmpewe1wxssa2odixhsktaz4ihlilmdehoe1hoiu1bzogsmrzgi zfrr3ew4ahyr6iwi0rz94nc axjbcorpro0 w7t 6o8uxa1oqv4lntoxmvyanneege4wlajlvezagkd6xmwrwf84dadi8tjgo6neg.

Branches can be utilized in a jariety ofyother usepcases, su5h as8code3revitwsn(aaa mxnppR2qqpafa,lkpirhto6 hi3mbcijdvilttdtmp6e5e8na,s7xpcofgdn9zzu2clt7yuotbt33tie18aacpyuaarf177ir 1v647o0ppcumvca.

Once you start with some examp9es below,ythese con0epts shou8d male moee seisec m4t’gb85ztdnx4tvxdb4taltpu5r7icm6wsp85yu0 rtyz4rjeqhksc