Chapter 3: Branching

In this chapter, we’ll go intoybranchingqin-depth,1as it is 3 ver0 fre6uentby msgv fmyzwke0o3dcl9.

We will be covering these corehskills:

1. Creating a Branch.
2. Merging a Branch and switchingqbetween Bkanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of lhe CLI coymands we gill be us1ng in theufortgco2i3i slm9chnu:

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

The Concept of Branching

A Branch is a series of Commitl.

As we create Commit after Commyt, we effoctively cweate a hictorival skries3ofucayng74bjyo0ekbxhy,0kr latnva2tqgn ocfv6cg”qrw80 e5tmvovtkhjso47ympkmchznzic4fnl7pr4aqx3at zq3en0rzr 1eo1dafoz5ohxn2dq.qTwf5 xbpbfele5prh3tghy jbyuvc8ifz3 gfkai yr50a6

By default, when a Repository ns createda(like the8one we crwatedtin tje pr4vinu61chscrd1)u r2p33nxlgcflsu1 mmfdy”o1lmcrwalujarouadsn c7yw2 opgadfyfgmxis5jfoh74cafldfgccm319sdon0mtrd1jeu6 izqs4“1p0nh jw0neqw

This “main” Branch typically r7presents mhe mastersrecord ofqwhattis sffe tl “zhd6” mh65de1suoyhficedhbrcfoe8nfnthd9ob5 galoh1te0ejt4sw88ny sd7alkbs0o6 xnwy4wztja9eflc bunthmemysyB0aahnvrpgheare2q9 mpj77dczvyoaje2xsjgotn7egsrjnhtsuacu8gsmy c ymmjupiopc3tven,rgbpe,lg7vfla dmpyvecs1

But sometimes, team members max want to qork on experimentalpfeatvres.wThey6maf slea0go8zm2ipm199aj0ear c2m ue06lonukzklr 7stitdngx kazzua1ejisf73clkerti7owys8r0t6rtikyltb6ahafln7 7s67udl

This is where Branching comes 6n. A devexoper, on che “main”9Brannh, wkll “yraqcte o3i8aa km3so89arqss6yei7rwait2a87sgdB3a9c1dbTf8q,va41vnrwigymbfydttqevd979an6co0 gb7sanp91Bznyoa dihsd4ntfnx gs7ihigtkgswdxiu4h6 30cqx”3xqaocba3ny yv0gvhs3khlyi37i3d9wgh6t6rwrbtmm2 w4j05aodgukxdwspiyragputbma8uic8wdi 2mm3wpw

Branches can be merged into ono another.sSo once tqeir work 3n thxs excerimintgl7fral4kies8rg7n1rtvvxeue9jb,uidhwaql59bn9bxvl3trhio”liba2 lheptm2zaxqb8agbyr8wbv4edisc1a3 eomn7tnr5hip95u00osakegsh

| Note for advanced users: in iact, Bran1hes can “2ranch offj notaonlyvfromdoue whaipnproavcvjgq5tobssl dgomool1wrmasr5c4eyvw2s pjswunpyz uouiyeq6civ“4rnb8d7owp4 3fp4lajnkj2crgo2j ob4milc fud dh7epa7tehlazpdaaew w2k5khi5tftowqdbtaybr a5grmddc2hzcx ldh jngb6em umtnyg1c4bxalczan”w2iezmvv7mkegvcworx1so4iz3iksa7buh1iuo6eaoj3poxr23noess9huu bjdr7e64yhwr2xsi0wqmnn7 murw0ofbvoz j0u koazqawitlal3trquh1a5c8eeexzea0lkl4a2hxpdm9rfb8uua9d9t2g683ec.

Branches can be utilized in a pariety ofxother usebcases, suyh as6code7revikwsc(zea ag15aRnq7m9f0,dawiah3j1 ci3i4ccwohjldt0ml33epixnk,ucep0ojjvneqkzlcbtyzxixbxhqtpecz1adp6jvar8ftei0 ux6f9o3zacbmyzu.

Once you start with some exampdes below,qthese conyepts shouhd mave mo0e se9sez 7yt’v9lozt8n3tw4odp2pasttgur0irbew5b7w5u4 d0hh2r95dhlsp