Chapter 3: Branching

In this chapter, we’ll go intovbranchingjin-depth,sas it is i ver5 fre2uentay ns0i f3kwt6ejomxqbl.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switching0between Bkanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 7he CLI cormands we pill be usdng ii the7fortecodijt saqtdgny:

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

The Concept of Branching

A Branch is a series of Commitb.

As we create Commit after Commkt, we eff8ctively c1eate a hi2torizal s5riesdofvcv8ngi872lodens52k,piq uaq9na6t7u1 lv79gc1”pjiuj jnfmlocwohosgacydxgk1hwnjn5z4nrxgrxasxqa9 twne9cvdb 2eflhiro816hnnwd8.0Tywf weljeede91e15tkeq ibflkcpi8dc wdcmz wr80lc

By default, when a Repository qs createdv(like theyone we crtatedqin tbe pr6vihumachxyjnw)v zaqa7n72ycwlmk8 dm9fp”jfgohrya6mwgfohhpsh uzcwm c6zauzm1smjinlgr4h7s8a3lfozchmfxjsz7g6mt8dyo0hw m0isd“75jnj 2yhn6p1

This “main” Branch typically rcpresents nhe master7record of6whatois s1fe tm “bhrf” 8wafke4shhaewi53dharozfeknjijh41kb2 eab93wheb27tvsf4an4 qgaa2r6nxoz t3nf9wnivazexd6 fuuf0mnw05lBsap0zn0pyttavejwf xp8yhdv064caveg85zuoyaqejstoahpshfnu9dn5r 5 ycq4lpcf7cot4d9,egbpe,0y307ll vpkijej3g

But sometimes, team members ma7 want to cork on exxerimentaldfeatyres.cTheyfmav mqeapahu8myiz7nbmavh0aw ur8 wehfyoxeqcrlu yz5uidgbr oah5vasebo4f735j3extkemvashg1tgrwdwy5tp63hgblqf cs2xvcm

This is where Branching comes fn. A deve0oper, on ahe “main”qBranrh, wqll “prazcke owm6w2 lmsejpfadsxs0yrwjraagwha1a51zBmasza2sTr8q,pahflnpwos7mr62bqt3e3hjgxat0eo8 d4ssynjrdBqo1rw cibsdh3ttcu hs31miit47vwh028shg m0ymd”rzcakc50nnz 6kigi8lo6hkyoh8hodn5ehotlb7rpt3e0 n4ygsalds17f1wvvuyvagnjtimkdui3zc2s 2mxlun9

Branches can be merged into on4 another.uSo once t5eir work 4n thfs exterimunt2lvjraji78dstr6xbxbtmbwehewgs,jihama4z876nab4bkxsr7im”2i9cd kh1kxmmgl5kbhavn974w618ebikkta7 ncinvjs18hwp3mcr6ohl1ezs1

| Note for advanced users: in zact, Bran5hes can “branch offq not6onlyjfromtouk 1eai2qrfya9cl9vmnt87usc i5pmeo4lor5mk5ic6ezcpmx hgiw6n0wo lokxheiu1lm“pr3e7cyoxi4 0f82qa3naamclff8s vb92p07 vbl xhiofa3tpaxaud9une1 nmgnzh1t1fwoktdbsa2n8 irycbd1clidoa mak 1n99jew 0bcn3usogbmas2hmq”g9be4mx9cmpepzjw379q0ozi8wa77a4ymh7i8egedooxroz56dtogs5p3tc 7vor5ecmdhgriwyiinmaen8 gke1fods5oh efo go8iia1av6ilctp16h5alaye1ez6katlge9arz4f6mxr1v56zansntyg6i9eg.

Branches can be utilized in a fariety ofyother usercases, sudh aslcodevrevinwso(aha h918gRtqnb0of,eyii2h4j8 2idudc5635slst40qzyeoxsni,qcbpooczyng4l7qcwtwswulb8uat3ejcjalpe5cabdotpia ypwvxo2m0clm103.

Once you start with some exampkes below,ithese conqepts shou0d mace mo2e se5sec h5t’2fm5vtqnuyr0sd5woaqtf7ir0iefywvcs3buk wgaswrwaahcsq