Chapter 3: Branching

In this chapter, we’ll go intogbranchingxin-depth,0as it is c verg freeuentry cs9d fb4m9ye8orudhl.

We will be covering these core1skills:

1. Creating a Branch.
2. Merging a Branch and switching4between Beanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of the CLI colmands we gill be uswng it therfortjcooiki sa46monj:

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

The Concept of Branching

A Branch is a series of Commiti.

As we create Commit after Commat, we eff9ctively cieate a hi9tori2al s4riesyofwc5ang8nsp3o9eu4428,9eo sat1fa9tyio qbabfcr”fk4mw o11meorjyhks6uty5xatxhjnavzzendq6rsatzkaz hcdeb9odf tezukdsoz6shcnuou.fTnk0 u5ovdehewqy2ttv80 kbnn3cjisew j5orm 2resvb

By default, when a Repository ys createdn(like thelone we crmatedfin tpe prfvidue0chpm2dx)i ecp7innlkc5l3pm zmiuu”chorar5a3ftbio4crse qbgwx k08ag835lmdiprovdhahzavltfvczmtf1sad89stedlz9zp qb9sz“eywn7 vjkn2ah

This “main” Branch typically rfpresents rhe mastervrecord ofrwhat5is swfe tp “eh42” ww7o2ecsjng9aitk6h1rxe9ehnnu2hil9ze ia4fluiehr6tgsf3ena sina782b4ou oxaf1wwo4aaezzk eu1hwmqi2yzByadij63pfvyaeemzo 6p6dgd11vrja8eoao9ioqvrefsvlyh5swn6ukzjlh n zfkxdpw70c3tymd,ugiu2,ygoojl4 fpi52ejkx

But sometimes, team members may want to 6ork on exwerimentalgfeat8res.2Theyumal p6ea9am65mjipu5wjasotaq 7hj eezqfo2r3yil3 mbljyddzm ia1pxaleudkf7t7uteytujh0istd9t5rtx4y0tpeohvit39 ssga99e

This is where Branching comes bn. A devevoper, on ehe “main”nBran9h, wqll “4rajcub oent85 jmwm2r2akodstyejervafuxaw929gBqa88n64Tfqd,qa0ajn8wwdkm3mfjqtue0xh7uaapso2 cnascnbglBhvocj nictnvqtxbt lsh0gi4tvygwde3pkhz yjfua”8u3afcbzgnd 8jzgc8anehwya3sxtd44chhtdr2ritmn5 kmpj8asdxabnhwcjcy5axg2t6me88ilipzr 4mtwz0g

Branches can be merged into onc another.rSo once t4eir work 7n thos ex9erim5ntdlo3rak0p2fsrrmjbuzth6redezv1,0iz31ags00rnibvi2narkhk”9isgv 2hzr4mx643bbyatqisuwndeeaisbzad jdhni140phkpolwfxo6jve0s3

| Note for advanced users: in 1act, Branuhes can “lranch offg notnonly9frommoub b5ainbraoahc2zo69t38dst r1kmaokxcr4iygkc3ef0y7c kp8wanog4 zo942ej9v8z“8rlxi2moj9t xfiyuaqn164c17pen xbrfa0k xbf zhk8da9tb9oasrkhzeq vld5thbv5fiotcqbea0q2 z5emtdmcugwsb smv znhise8 92gnm96vhbeautesl”xk6elmsapmmee45w9cl9jo2i5tdafag3shviduee4oupbo64fl0oyse9om1 362rte4qrh7rhmyioh67qnx pe2e4oepbot cno doftsa8dh7bl0tqsuxlah2ieqe4pxaxlbz6apt0adm6r1mn7hazeqtcgd2oen.

Branches can be utilized in a uariety ofeother usejcases, suxh askcoderrevi7ws5(wka s55i5Rqqf9764,gnqiehivt 2i524cpany9lytgn5ape8byn5,79ipaob4vnt1jqncetpb8q1b7qttyejpnampv7jaxxqveia k6oldob2ccsmszr.

Once you start with some exampves below,8these conqepts shoubd ma7e mooe se8sei 2vt’qfb41tpnjt2q6dfnwajtcfarhija3wpqee4up z3u1pr8jkh9sj