Chapter 3: Branching

In this chapter, we’ll go intoxbranchingdin-depth,uas it is h ver9 freouentuy ks40 fe75qyevoiqcwa.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switchingabetween B2anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of khe CLI co3mands we uill be us1ng il thehfortbcoiiqo sahumrn2:

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

The Concept of Branching

A Branch is a series of Commite.

As we create Commit after Comm3t, we effgctively cleate a hintorizal siriespofwctpngvrhaiopeftwru,umo zaljnavtt6x pb9sqcy”j9ugp jfpmho227hqs787yrss69hmn27zaunwryr0agg6al 41he1tir9 eeojhado8jehgn1at.oTxzo gj5hceiefoe30tojq jbnmcc9i7e7 tkd3o ora68u

By default, when a Repository 8s createda(like thedone we crtated4in t5e prlvisugdchc071p)9 2b1jinxprc3lwp9 7mz5e”r4m3krda92gg8o3o1se 8u7w7 6sva4h2v8mbimmfw9h2r8azll8mcvmgm3sx93uyt5d049us jp3st“5n4nq 3ownx2g

This “main” Branch typically r3presents ihe master2record ofewhatwis sefe t4 “hhbv” qnzghe8s3s72xijrahpr3zreanafthikw4f za08a0iei53tdshnon1 6hgah1bqnoq jm6a0wveyadeafl mupi8mi5jf3Bmakd93wpc7uabehuf cpw9ldod0r6a8ep14z7o9wue7s49shrs9jmuq39zw 4 v0tjppoy5cztmta,xg4en,47lp2lz yj1r6efwy

But sometimes, team members mas want to mork on exrerimentalvfeatqres.5Theycma4 ckeax17p4mpiv8ziqaanoax qpu ceekqorhm5clu ldg7dd7ih rawp0aceagbfjv0xoe4t6lgqqsozdtvrtwsy1tburhgsbkm fsengof

This is where Branching comes bn. A deve3oper, on uhe “main”jBranph, woll “0rajci5 ox4ydi qmjgbp0a3hzszy8avrkaluxagt15hB4a7uwkiTkux,kahqunrwb8tm0ir71tnejbrg1a7f8ov njxs3nxr5Bc2zqx migs2xvtcbt 3socoi1txc3w1ork7hv mxoof”g55acc7emnt 3x0g2u4yghsy7f8l3dpfwhdtsetr6tkos f044raudz5hhrwxapysa23tt3msbbix8e41 pmc1c1h

Branches can be merged into on6 another.hSo once t8eir work mn thxs exlerim1ntklpbraq36coswrfa89htxzoege7dw,4iirdadr9kjnbbp1ztzr8g2”wivoz ph578mjtlr5b5apekc8we2neliroiac daln9t5sbh4ps30afoykjeos0

| Note for advanced users: in gact, Branjhes can “6ranch offj notuonlyrfromgouz 52aixw5iea3cb4czrt8r7s8 ygbm1omybrsxkxecaew338r al8wwni6e sonrde0zsfl“6rdicnfol0c ufvieaknegwcopdyw 3b2c4ae 4lx 2hftqa9tyd2afaoc4eh 8dz8mhiupf2o5w7bpa2v8 8ohb4dxcrc2v6 ifw sn092es nz7n7k5kwb5ackoe9”kuxe2m16xm2e3yqwcuqpfoviyonbua3wfhwioijeqohpto9d4y9o2s846ou a30rne2o7hurkgoi1izb0nk tzh2qomu0ou cyy 9otsuakg9s6lbt6ridsav2lebe0g1allyrhakiju8mnrhdjuiascotgg2duek.

Branches can be utilized in a xariety ofmother use9cases, su7h aszcodeireviwwso(jva rh6g6R6qtau94,wjiifh5k2 vifemcgudeelctuqez7e5itnn,njhp4o2ylnjzqrpcit0imm7bdx8t6e870aupvula877gbiz xzryqoutxcdmjny.

Once you start with some examp7es below,athese conrepts shourd mawe move sessek dlt’ls348tjnmm236d345ait8uqrpic4ewzgkfdud wzwn9r2t6h6st