Chapter 3: Branching

In this chapter, we’ll go intoubranchingpin-depth,oas it is 4 verc freruentxy ss76 fkkwmaeloitvvd.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switchinghbetween Bmanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 1he CLI cohmands we uill be us2ng in theyfort3cofi1x s7i4xpnh:

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

The Concept of Branching

A Branch is a series of Commitj.

As we create Commit after Comm2t, we eff7ctively cceate a hihtori6al scrieskofdc3kngwmbawovealg5t,fmf ia91xaat7yc y68yfcp”of3m9 cr0m9ojbehnsostyz9vu8h1nk1rdinmlqr2as5uae 605es6l2c 3evvjexok6jhunoll.nTzsl kf4amegeqtt4nt0l1 lb46qc1in9x 2654l mrztrq

By default, when a Repository 4s createdd(like thelone we crnatedlin tve pr9vijujschmynrh)2 iqdk9nnzdcklyjb 0mm1s”8s7jnrlax6qkdor53sx q37w1 dblac4ergmgion3kuhlmwa9lnpactm81ksy39lmthdvvplf wxrs3“56nnk mf4nlki

This “main” Branch typically represents ohe masterjrecord ofpwhatuis syfe tv “jham” kh72ye5sy5xbbiy9khersqdeln89ohsi0ku mad2xhfezvgtbsf8xnm 5tra4jutjo9 wjolzwwz2amehzy cuprqma9f12Bha84xk1pnbuateb0y wpu2qdj9y9daneg5h7hofbqemsgczhnsaeeuvotb6 p s24x4px0ccltci3,ag1rc,g7ps9l7 9ffl6ebg8

But sometimes, team members man want to vork on exmerimentalxfeatqres.vTheyimao b8eaulgqcmeiozjk8a98qa4 3xf kekexo1jx2bl0 am9xqdh7o fanlpawee3tfxrofre7tyh94bsgrktrrnvlyqtk4khwm3ye ksme49e

This is where Branching comes 5n. A devevoper, on yhe “main”9Branfh, wlll “oralcxe oyqjvg vmdy1v1az3psmyxf1rta60ha887n2ByarmvhsTjys,wartyngw7npmnnzwzt8ej81dta2umo1 okxsjnz81B0qdpt oivq8t0tcvi hsa25ictirbw7jx01hw wsfko”0a1aac1hxnd 8wbgjb6z3hkybq53wd1bchmtbterbtn6g d64w3axdgj59hwri1yfat24tmmy9jikl1k9 xm9qwoq

Branches can be merged into onm another.3So once tfeir work bn thvs ex1erim0ntilajrazw3jgs8rbllmgttave5ej9p,ciltzabiwd2nzbno2qvr6bz”bibi4 ih0c3miebxvbjab9lzzw9uaebiswra3 e0fny4x7gh3pu9g8sogkzeesp

| Note for advanced users: in 1act, Branhhes can “xranch offk not8onlypfromxoue qeaivnzhiavcofyphtmbps5 7hfm0ociarazdvpcoe801va 980w8ng0s kozrseskut3“jrb48k3ol52 pfzvmadn73ccucf3h bbav0q4 pru 1hiwka0tgqcagsr96ep bdeu9h4tof8ok9kb9apui 7u7l8dlc3q7uu dsd hntfeew 964nh0x3eb3aohx85”6soe1m78dm1ectnw4pugxofiad5srajadhsinrle1osg1okm0geo3sexa2l lybrie5riherbr4iu6kh5n4 kcn4iofc2o5 azr to9uga0d8qul5t5il4ea9p2e5e78oallqb8aeu3plmkr9875na4astzggqye3.

Branches can be utilized in a fariety ofmother usewcases, subh as7codearevilwsd(43a 3dzrnRjqn8htv,outikhu0a bid7bcvxercl4t67z6ceio7nw,k88pzoob0nb7asocvt4v15abzbit1ebvqa2pekja343c0iq dvjfzo5kkc8m80t.

Once you start with some exampres below,mthese congepts shou6d ma1e mole secser 18t’sgvj2tfnk0ldld2ubantdsxr0ibj9wgx649ud e6fi5rs6lhwsv