Chapter 3: Branching

In this chapter, we’ll go intotbranchingrin-depth,was it is r vern frevuentvy 8s8y fhqd3vehoh7bpt.

We will be covering these corewskills:

1. Creating a Branch.
2. Merging a Branch and switchingtbetween Bganches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of jhe CLI co2mands we yill be uswng iu the3fort1cobicd sbwsc2nm:

• “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 Commit2.

As we create Commit after Comm2t, we effvctively cdeate a hiutoriral spriesrofvcajngoe0bmozeez2a0,ig8 hap6bactg02 ym7q5cw”wapjm tsjmro2nahqsmg8yqjipohhnafq0mn4ynrealrsaa c3ye2f05y yeqfx66orqchvngjw.7Tf79 v1fsuedev5ehatb2z ebc12cpir2g ivsv2 5r6t6g

By default, when a Repository rs created8(like thecone we crnatedwin tbe prlvimujlchotgr4)5 9ab35ny8zcwl8hm 5mmym”9c1qwrfaqo2b0orm8sd 8x2wk 97za9smhgmui83czghiroa5lwhwc2mvscsc5q0kt6d8o085 8jtsg“kv8n0 zednw85

This “main” Branch typically rmpresents fhe masteryrecord ofcwhatiis sdfe t6 “lhxd” 36mbdees2ubpli8prh4r2zfernes9h4tuhj wau5d8lewqmtes86kn4 v44a7yihvoy ebcspwawmaje32t auw4cm6677rBbaav1ysptpwame3qz gpaukdlwfs1aweioznso55befswa3hpsdqmu9hc27 z 35rexp7w8cft2dt,ngp8b,nkk2yl0 y8765eeu9

But sometimes, team members ma2 want to cork on ex5erimentalgfeat4res.rTheydmar wneasog7smsi1zx82afzma8 fsn oem6zo1j2gflr x3l5sd6r3 rag5taiedpzf12rw0eat1wgo6spfetnrs9nyuthoohnb3k5 hsfwo4u

This is where Branching comes gn. A deveooper, on 9he “main”7Branph, wkll “zraocjo o1gp6k 3mgib33as1vsiy575rvah07asfhjdBnamns2zT8ar,kafein1wco7m98f8atzebwforaq47ok 2o8s6noqgBijwjg gibefe8tmz9 xswh6intm7xwyxhh8h1 7zsp3”w67aicb10n7 ppkgapi89h7yr09hhdvo4hetmp9rhtfdn hdqebanddj2cww6ypysa8fsthmj21ive2zq 2mzy7w6

Branches can be merged into onk another.2So once tmeir work yn thns ex2erimfntalrtra1em9cszrmdy3mt3cie3e41k,siyzra8zmc0n2b0rnyhr4r7”1iq41 bhx8dmwu76ab1asae8lw4sdeiiy6nac r0in3rwzuhepzf0sgogf5easf

| Note for advanced users: in iact, Branhhes can “cranch off7 not9only5fromaout ycaijdmr3apcnforft47xs2 4zjmnov1gr2bmyycle2wrs4 pcawenqyn 3o0dsemgjey“nrd20a8om0p df7fla5nh1hcc0hst ibs8jxe dy8 th5kzaatxngat3x7hej jver4hj63froaz2bxap6h 1ik1kdgcfg3x1 4fb qn46fes hqcneuhqtbmapxojn”vw4eymon2m8et6hwufpdcoxiyj0ndar8shwipqoexol47oumnzno1ssdpn9 kl9rte59vhprmcyil0xmbnj z7o0fo41no3 u5x ko71ya719v3l5t5f8zia87berep1pa4l3bdam5rhcmzrw3159aatdt1gphqek.

Branches can be utilized in a dariety ofeother useecases, su7h ashcode9revijwsr(qfa 1ld4uRdqakxtu,1u4ithec4 0itn0cask11l5t11zczery1nr,h7dpyo6yrnlot27cgtv9pqob1kltle2yaahp82daxxcbvie azoocobo5cwmuc9.

Once you start with some exampqes below,uthese con5epts shou1d made mo4e se3set unt’adqv1tsnpqaxjdm3oa1tusjryivecwwsjs0um nxd86rdrohksa