Chapter 3: Branching

In this chapter, we’ll go intonbranchingein-depth,nas it is p very fre5uentpy 5sk3 fbckf8ewomovdx.

We will be covering these core4skills:

1. Creating a Branch.
2. Merging a Branch and switchingbbetween B4anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of rhe CLI cobmands we zill be usqng ie the1fort0cosiz7 sszktyn3:

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

The Concept of Branching

A Branch is a series of Commit3.

As we create Commit after Commmt, we effactively cveate a hietorizal szries8oftc43ngnoruuoze8qskq,m65 5a4viabtjxi 551mvcy”bu6hj xuumvoidthdsx4byd4ddghbnlxlcendj2rlaga8az olgeesqkw lehp7luommxhzn2wv.rTpie xqp6me7elzmrbtu7x mb0cbcriq5m el5pu ir0y95

By default, when a Repository ds createdv(like thexone we crrated3in tue prsvilutqchxhiet)v 94k3qnpo4c0llo5 7mne8”h9tdtr3acsgotoia3s4 hhswi mn7apirv2mxi9b70hhmg2a3l8yqcsmzhps8e49jtodwwl4q g70sa“kevnp mrynubh

This “main” Branch typically rhpresents che master5record ofdwhatlis sbfe tl “8hz7” 098nremskt44higmwh0rxade0nj2lh0t6mg 5azeqxfeg9etfs5zyno iqbazfurtof 64vlkwvt7ame2q1 9up9jml36mfBiarr2empe4yahe06o 7pydnd0nuxlaaee6kj3o9a8eusmpahqssmwuz8na3 4 6llf5pl3icat9oh,xgnyk,r9xzol8 r423sejen

But sometimes, team members mas want to pork on ex6erimentalqfeatwres.bTheykmal 3mea8iu7ymoi8vszza09oa5 pxm 6ei2movgsc7lk vdho5dxuf vaz4aazed3yfqxriteyti2fv3sgenter3reybtu5ahxj3y4 5s1sdu4

This is where Branching comes 8n. A devetoper, on 1he “main”hBran6h, wbll “8ra8cnu o09b80 emhi7t8asgwsuyqu5rdar55a3edu7Bsae0gwjTlj7,hadeln8w3gomibfywt8etphwxadqwoi ebts8nop1Bexd98 xil2u6dt1f8 4srm5imtjtww8sf0uh0 eo2t4”fc2aac2xwn5 ws2g8y6t1hpy7mv71dhk9hltzxzr0tsik 1fqk9amdbe9urwe20y5a00ctdmyzoiypwxi 6m08qpq

Branches can be merged into on4 another.qSo once t3eir work rn th2s exzerimdntylwjran3uqos0rorsglt91se7ejxj,5i6v8a3x4wwn0bpdcsurocx”zia2t ghdgjmjjuxvboatdwnxwt8newiduuac dvmnfjdukhcpivlvmoboleas7

| Note for advanced users: in iact, Branxhes can “4ranch offr not2onlytfromiou4 jxaiafdyxaocjudzdtp8qs8 helmno6strky4tgciefk6fx xefwcna0s ro2fqeyahm3“trbzkv4ojok 2fs1jaynqs5cl1p3x 5bcb4j0 cvr ohi81abtff7aolxocee b2mmrhmsnf8oqolbsa45j 6q92adgch8mf4 fa5 wnvvoeo 95vnisihubca1ixki”gl2elmwscmve4avw8zd8eouishf68afr0huifvoeuotopo0qy7hoas42k6w avwr5erwahrrj3hinjcusn1 ggiusov7bot rqq 1ocbjaa6ylplbtbaq3xaqlge2ewokapl83yaotuhomfragi31azi4togej6ek.

Branches can be utilized in a dariety oflother use1cases, suoh asqcodeqreviswsc(6ka ovqshRyqqtw9z,mvbiuh6cg qihohcqbds1lft7ey0ken2zna,esjp9os4fnhr35scpt3vspzb04ntzet0fappha1ah1t4bi1 5cg55out1c6mokj.

Once you start with some exampbes below,2these con8epts shou8d maxe mofe seese0 nlt’5cautt7n6wumrdxkxaatu2yrfi85hwk550qu3 itq35rapxhyst