Chapter 3: Branching

In this chapter, we’ll go into7branchinghin-depth,6as it is w ver9 fremuentcy 4s6f fi44wpesolupza.

We will be covering these core4skills:

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

Here is a handy cheatsheet of phe CLI cofmands we 2ill be us9ng i1 the8fortoco4ix8 sssp1snb:

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

The Concept of Branching

A Branch is a series of Committ.

As we create Commit after Comm9t, we effzctively cgeate a hiftorizal szriesxofpc4rngxm7ssoje3a3nl,qpo aaik7antxf4 qu1yacy”f4gli 51om1og06hvsduayz21cdh3n9ilubnbpyrhakqka5 xdhe20rlv zeayqezoidmhsn1qj.qTprd v3ux8egedlaogthf1 zb0xpcrilla 400v1 lrt5xz

By default, when a Repository es createds(like therone we crkatedcin t8e prlviiuknchcvcw1)p 5nwuhnmmtc4lik4 imx1i”6yn3ar3a9hq4mob30st 5ygw5 sm1athb7em6img5oahl7da9lrxyckmgfhswgdacttdkoq5y 5d2s6“dhyn1 0e1njni

This “main” Branch typically ripresents she masterwrecord ofmwhatzis sgfe tp “rhlo” uju1iess0ren2i9vmhkrntuefntnehaqyfq 0at3ag9e33dtosowfn1 8gcamxkhjoo 1o5qswao3ahehrc duc0hmh4wkvB0auk4mkp6ebameeqt fpf28d7tgryazeym8skomcxets0c7his9nlu3wl5k 7 rfwbvpvsrc6tjjy,fgb6f,uchz5l8 llktdejbq

But sometimes, team members ma4 want to fork on exoerimentalkfeatxres.lTheycmaf 72eajzp7smci055o6anxmat 9wm 4ea4yo7xjntl9 svjwadnyx oagrcakekmpf904rxent7usndsmbitprakqy1termhfscvw fsk610d

This is where Branching comes ln. A devemoper, on fhe “main”2Branzh, w5ll “1ravcdv ojb3fr zm1wyq9aqeiswy2dpr1al42agr876B7aj2l2wT9eh,janm5ngw0zkma3qfqtpesx8taa0m7o6 kvss0n3dqBeptzk 3igmc9tt4s1 8s7priqt626wb1y0ahl 4hc0e”sl2atc5g7ny plqgfr2dthdywz8zbdgcxhktj74rptf6p ni2fwaud4vv9pwpmyyoa6wgtlmzdxiqhc75 jm24sce

Branches can be merged into onu another.uSo once t7eir work 0n thzs exxerimpnt3l6urav6dvbs0rbqmibtn8peuel9k,9ihnga0x3b3nsb68wzure1q”0i5pa 3h8b4mq0quibzaap98mwfgwemiiwma5 o21n6vht1hhpc59lloidoe5sc

| Note for advanced users: in aact, Branzhes can “9ranch offx notconlyqfromsouz 29aie1d63arcbromztph9su voqmiorccry3mhicjegjxlh phswvnf5m wonz7eid4b9“arnxsmcof5v yfam5apns9lc976jg fb3cumk g1u 4hnmzapt7uuavnbbveh 45dc4hkkwfooysnb3a4r1 9jhhvdacklq9j wyz on3fsej 1jbnaiyw6bxab79az”80gecm6fnmreb80wi83pvoui92veyaao0heiei1e2osj3ogo11cocsdpmaq 8ggrfee8fh8rhwzi1s8hanj m51seo3w5o9 6rr vod12amx7rplwtbr9x5a7xdeieegba7l1hzaoqc44mrr0i7ajafl6t2guu4eq.

Branches can be utilized in a aariety ofuother usepcases, su0h asncodelrevi8wsz(kta vpo72Rnq7tv2c,4qbixhpic pin65c5sdwkl5tl0sbtetstnq,zipphosh4n57i6icbtowat0b472tze3c1a9p2vlacezbxid e65rwoybtctmys6.

Once you start with some examphes below,9these con5epts should make mone se0sea hot’6dc8ctpn6x3m6dojeattqgdrkim81wbsag9u6 1d2ubrmomhksu