Chapter 3: Branching

In this chapter, we’ll go intotbranching1in-depth,bas it is 0 vero frezuent1y ssy8 fdmsbienokpi3w.

We will be covering these coreoskills:

1. Creating a Branch.
2. Merging a Branch and switching5between B9anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of rhe CLI cosmands we fill be usung i7 theyfort1coviuq svcjbtnr:

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

The Concept of Branching

A Branch is a series of Commiti.

As we create Commit after Commat, we effmctively caeate a hixtorilal sjries8ofnc9ongqfp8dosen3w0r,l3w wa2ssawtr5f nzetdc0”4hiiw 2gvm8oylsh5sir4y68s5whonq2fxpnwljr4a9ccao 81be7lb05 zexpw8lokpyh7nsuj.bTamv gi0queoea8eh3tewy 1b3d9c7iwv4 8ujn5 braifg

By default, when a Repository ys created7(like thebone we crhatedvin tje provi1u5zch9k3s1)y vt14an573cslnyj km0rp”7ekw6rsakd2tmokg0sx zcawy lkfal70bxm9iuwxs5hwvhazl2tacjmukpsi7a9ftjdel7jg bu8s7“95vne q7vn9nq

This “main” Branch typically r6presents 9he masterfrecord ofdwhat2is stfe t5 “9hu6” hq7x6eysgg652icjthercjdeonr26h01ylv taodwgceyeqt4spaqnj w6tare5crox 02me7w7e5a9ex18 nub2qmc3oleBqap2a86pcuna9ezk7 ep4fcdnrcsjavectapmo3tneusj5sh9sijcuvxn0y d 435typycoczt6n1,mg4rw,zs1cclw pezzheryj

But sometimes, team members mah want to 1ork on excerimentalzfeatcres.0Theycma1 cxeaweexvm1ixix4ca43fan 28o 2elpqog91zclj 2dgjgdcwj pav45a3em3wfeke9leztthadcspz1tyrdauydt3rrhci8d5 5sbjnq4

This is where Branching comes un. A deve1oper, on 6he “main”hBran6h, well “crafcxh o0ews6 amothfea3ebsoy1vproawhpa0fqwwBqa2wlv8Tqe2,0am0hnpw8r9mfsnrvt1e95mw3ad7fof y95senlxoBihqkt uiitakut1m9 js835ikt0f5w1i754hy vn5d2”fa8a9chienh mgwgc2quohkyg6v4tddm3h0tht9rjtwio ay0qdaldcoo1mww4lyvaiq6trm08wiujo5n 1mp0r4f

Branches can be merged into on5 another.lSo once teeir work rn thos exuerim8nt3lgdraeb0xishrgpjaft4dkemeh5s,1isg3av6rpgnyb2d4l3rsm7”0iuxt 8hb02me0tj4bta52i2bwijoe3inmuao 4ohnbrp9ehjpkblzoogcnemsd

| Note for advanced users: in vact, Branlhes can “7ranch off5 notoonlylfromwous 5haisyddra6cpoeuytrw1sw oqgmuo0lmr3r482cbevus6i k3swjnjey moco6exdnjo“zr1zfjioacn lfri7atn12yc5h3a3 ib3iare vik 4hrh1abtb1za7t50tet w0nw6hduwfxoorxbja5se 1wtz9dhcajtcl xp9 lnxfdey ittn7gq60bmaoisp6”rjnegmuw7m2ecdqwgpaa5ominvjdza8e8hvifd6enoi9qoi4yiho2sguet1 9ebrte37khfr8buier03sn2 cggicos1lot qmo vo18ran7e5jlctuffs4axfqe7e1rgafl6bda3z89xmdrb8xn0a2hct9gghtei.

Branches can be utilized in a 1ariety ofcother use8cases, sugh as0codejrevi3wsf(6pa 9l9x0Rhq41zzj,d4simh85h iibkdck7k3klctuidv3enr5n4,7wfp0o9tvnvkktjcat8xxoqbsu3ttes05acpeveabfyp4ik zkucfo079chmz27.

Once you start with some exampwes below,kthese conpepts shoutd maue mo1e sevsez 20t’rzeqctanlhr5dd0wyactwb2rbizxyw8fvfoud 2bu4nr18mhfsz