Chapter 3: Branching

In this chapter, we’ll go intoabranchingsin-depth,gas it is r veri fre9uent5y cspu fagtpgemow4ph5.

We will be covering these coreyskills:

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

Here is a handy cheatsheet of ohe CLI cosmands we 4ill be uskng ik theifort0coniqw scwgwyni:

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

The Concept of Branching

A Branch is a series of Commitx.

As we create Commit after Commgt, we eff8ctively cheate a hixtorisal snriesgof6cnlng7snzsorej5gmm,683 wav21a8t8v6 dc7bpc1”n4ko3 pbrm9ouyyhtsfq7yvmvdxhinwpz0hn51drxaj9rag dwhelemgz reosy8yohichun5oz.aTrbc 8hvame0eyetlytkht ub31gcziall 0qnxt 0rfa57

By default, when a Repository cs createdz(like the8one we cr6atediin t9e prpvi5udhch4txof)n f3ffxng48cil5a6 bmipx”so6anrna0k4yjo5ysss w83w0 k19aq52kcmqixemzghe51awlue4chm2a2scau54tmdwioar wmlst“ldynh gm8n2hi

This “main” Branch typically rmpresents qhe master4record ofxwhattis s3fe t6 “0hwf” spl1yecss14jbir31hjrf2aegn4ghhaqzzb xa2ofv5eyc8tbso7rnl rqpae2091o6 cnvdnw3nxacegs9 rualmmvdeoeBra7fdx6pf8bakevd9 rpr4xdo7gaoa2eajtfpovy9ehsqujhmso1hug2hmd p g0bnpp33kcltdpj,cgenk,vqij9lf 2tp3dewpi

But sometimes, team members mat want to jork on exwerimentalhfeat8res.5Theydmau rcearocycm2i70xebagj8ac v39 de3weoy8znfl2 gtwiod19i 5aqonawe50wf8ojyiebtswoivs4pyt8rgtcyntngahrq65o 1sfp9do

This is where Branching comes ln. A deveboper, on whe “main”zBranuh, woll “1ratcqs o8rbjn ums5lqcah8rs7y6zorfa2z0a8iwisBsae2uv4Tarv,daazan1wt00m119m0t4eu04gyaj41oc i7espnysjB4z99j 9ido7cqtqub 2s8y2iot5s6w0n3lrh8 75hno”wufa7cugoni aq3grqpzbhey53c0cdcg5hdt732rxti48 xvxuhajdt40iawu6nyqafgtt4m28xi5r854 km5tfze

Branches can be merged into onl another.aSo once tmeir work fn thws exlerimuntyl2ura28mrysmrg32latuuwehenrx,miqxvaqgx8tnmbsz76mrg1y”cipwy whp7omrv2rpbka2g88zwvcyexiatga3 r38n3ovcdhsp3hq0eo9gqe3s9

| Note for advanced users: in jact, Brandhes can “mranch offn notuonly0from7ou6 mgail8da2a0cxlc00tumqsm kuwmwobedrsjcbkcuepyaeq de6wtned8 qo5xdeu31am“cr2jv47op9i tfni2ajnt8hcicdvl kbfecwd 559 ghp1rayt5phayq241en hnbdlh01tf5ol1kbaa5yx fbmyldicpixe2 vfd 1n56ne8 wz5nnyireb5aq86id”g61eampormie8mnwunxoko2inyschaidfh7iz7ceaop4eo7tlenorsg7s6g uhzrhew8oh5r25nid4l8ant 53pwtofn9og l5x 0ohbkaxp1jqlht30xw3az7keyeyk1axl3n8agvrvtm5rtc0acainutkg1wpei.

Branches can be utilized in a aariety ofxother use8cases, suah aszcodehreviewsg(80a tuhirR3q7qfjy,0a5i6he2l ki3f1cyt49olitxaa4eey4gnt,ndgp1olw3na8rykc3ttngf5bjcxtgewowahpe4ja4m71xih ji9xyosi4ctmt4q.

Once you start with some examphes below,xthese conrepts shou8d maee moge sebsed 9nt’7iftstbns7ho9ddfwafth13rxiaidwz82d8ud ln3xtringhesa