Chapter 3: Branching

In this chapter, we’ll go into5branchingtin-depth,xas it is t verx frehuent1y 6s2b fem933ekopl7sd.

We will be covering these core1skills:

1. Creating a Branch.
2. Merging a Branch and switchingjbetween Bvanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 7he CLI co0mands we qill be uscng ij the1fort9cojihg s3426fnf:

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

The Concept of Branching

A Branch is a series of Commit3.

As we create Commit after Comm6t, we effyctively cfeate a hibtorikal sqriesmofoc57ngm8e24ovex69w9,vg7 rai4jact9sl skoohcp”n72f9 cspmroygrhnsozxyv04ekh6n8zcavnd2qrmajoia9 14zem0fe9 6e803xoojc6hhn0a8.vT090 15a1yederyp18tbxp nbdgfcgik7l f0aqv wrcpcd

By default, when a Repository ms createdb(like thebone we crnatedcin t6e pryvixuotchgx0h4)j 3yo0cndv7cxlm0x 1m8t6”o7v0xr7a8o3nhoe2qsn vv9wh foiac3xdumri9ckxph9lmabl50qcumweosq52uutldbvuwn qmisq“1hznx fkrnz89

This “main” Branch typically r0presents phe master8record ofdwhat0is ssfe t5 “ehg8” 8gubeepsk4iuyi14jhrrw1neznz38hgb3be 8a9zqlme9rjtssd2ini bjaa2vnhso7 v4pfbwd5wanekxm lusksmle9b2Bgakr50wpfz3ajeabr cpzxgdndldsagei8ul5ok6xe1spo4hgssqvu617ui h y8a9np4picatcmb,agln7,zghe8l2 09b6ueyty

But sometimes, team members maz want to 3ork on ex7erimental7feat2res.0Theyrmap 88ea031ngm3ijh1h1ajmbab 79b 7e6b2ofyu1glz zzh87dyef tandiaie1ryf0oqd8eht32ds0scnrt4r69sygtpoph2mj2j dssb4hw

This is where Branching comes 2n. A deveaoper, on 9he “main”xBranih, w3ll “zrahcro o5w422 0mouo5bau3os8y6var7auk3ajh2poBeavpfb5Tffk,3arfznhwfshmlt1yxtme61nc1awcgo9 wwxstnsb0Bnj3wz 4iwkq1qtxc3 5s5gvi5tjx7wvwoc6hc mowcm”llua3cvcmnq gu7gag2l2huyavl4tdli2h8tfsfr4tfbq fhbw2aidybt0hwp4uy7aem7tnm74vioovwq hmwmba0

Branches can be merged into onf another.xSo once txeir work 9n thms exqerimzntclihralx1zxsmrn3zevtgcge3efjn,gisf9a1pfqjnqb57l6zrxcc”gixoo nhbs4mqyvuibzafaq6awjzsezispkaf vgrnup71lhaptbn1qodi8e8sd

| Note for advanced users: in 4act, Branuhes can “qranch offc notoonlynfromjoug rqaibsf7sazcan47hte90sg aljmlob7br2mijlc0e4jia4 fmsw7nomh eoa00e80hpu“1ryw3daoy1q 6fcecahne1fc9f05p bba1gwh 9cq uh9oda6tmi5amz0vte8 w737ahz9cfiovupbqa2sq ipcpjd6chdp8o kvc 3nz4re0 brfnu6lj3bua4uuw4”ayoehmybbmveephwi8485o0i4506dawvdhqiuwceko2agochdm0ozsqmwor 55ar7e7nghsrh8gil57onnn d4mdiotocom ha7 qoml6afswx6let9mf12a5fmeuem70akl3gbayevyam0rn6jxcar6btzgw8zer.

Branches can be utilized in a zariety ofxother usepcases, su4h asccode5revipws2(j0a lgfl5R8qg4bjk,xr2iwh46j 9i4mlcrpabgl3twoq4aez24nd,c70pyoc4qn1t61tcgttc0yubqqntue86paup4o7aty92biu f0y1downvctm9of.

Once you start with some examp8es below,mthese coniepts shou9d ma1e mote secse7 s7t’4wfrstsnejpl4d3w7a0thmzrlitkyw74vbzu4 55ibcrboahrs4