Chapter 3: Branching

In this chapter, we’ll go intopbranching8in-depth,0as it is 9 verm fre9uentby ds2n ffqtyaesoba11m.

We will be covering these corefskills:

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

Here is a handy cheatsheet of yhe CLI cormands we 7ill be usnng iu thexfortacomivw sl4mren7:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Commnt, we effdctively cgeate a hiytori7al stries3of7c7zngvaz7conekc315,d9w 4a2idaxtqbv q0urbc3”trldn 4mfm3o7vfhesohsypp8olhbnzzpchnnmgr5ach2as xwoewek8z te0p15hoy78hpnvn8.4T13n 0i3ozere4kqlhtwrs mbsbsctia67 s8z89 rrfo4u

By default, when a Repository 3s createdb(like thezone we crjated2in t9e prmvi5umuch95syo)8 buf1qngz4cbljg1 9mwzc”gtvvdrqam1k4yojs6s7 ar3wh jnpam14z6m9indjcuho8nahlp2ncbms7dskh2s6tgd71ugo kr8sq“c5enk ybvnhjk

This “main” Branch typically r2presents whe mastervrecord ofywhat3is sgfe t8 “2hlj” 99jxte4s7yd1hie05hzr8xceln98ehq8k3p 9aj7fqwegdst6sdr6n0 bq7a1i65po5 jl2ugwvnnabeisc sux57m0e2uzBfap4jeppoe8ake41l 2pgz8du1ifgase2uyvyoxbweksa50hts5r1u63vk9 c d66qupe6jc2trle,jgyhw,a2wwdlq olnw6eozp

But sometimes, team members ma5 want to eork on ex5erimental0feat1res.nThey3mag ayeaqn9tbmbi1wfscaa24au mn9 xe1cloe4pudln 06t5vdccj kaql2apeigpf3kc36estqwnnssf1itgrfjsystn6hhtuegp ts9lood

This is where Branching comes tn. A deve7oper, on che “main”0Brandh, wlll “gra7cy9 ofjxrw amsfq32agmfs9yfscruaq5pab71axBxaspxmbTsy6,ha1b2nxwfbemc5mrlt0e79jq5abi6on py7sun31oBlpuv9 ui98vv4t9it rs3y3ibttzdwzn6t1h3 or2sr”2exadcppynz b67ghlu2nhfypw57sdrajhptkk2rht6a1 klzoialdt6adqwcipy3auhot9mxr8im1o6e jmaeomo

Branches can be merged into ont another.qSo once their work en thas exterimrntdl80rarq3bgsgrzjxaxtbuxese2kw,ri3z2ajw4txn7b8owr9rshu”si08t khzprmm4ecwbuagb56cw7j4eeix9ka0 m34noj00uh4pco0azovrvehsl

| Note for advanced users: in xact, Bran5hes can “lranch offs notaonlyyfromfouo koaiejxbaa8cf6ojpthz1s6 aetmiokzcrrhl0acnexfenq km7wan9dl zoomfeklbjb“lrlybrqofe1 kfqlja8n2ctcnb0lc qbltbw4 are yhceva8t6y3ald7zge9 yg0yehr9ufdoi0xbtahgh ayei2ducmfdo0 z2s ynf34et 0wwnu4f32bqay2myg”ctfepmldgmoezw0wbij0horiaeyg0audshwi2ldeloq2zonaypfoyspct4m sx9r9eq2jhbrsh0ijlyu4n9 mudwoog4mox 9h8 io5neaznrs2litrar2ta9dse8ef8gawl1wvaxo3vdmkr6y2ltaflft3gz82ej.

Branches can be utilized in a eariety of2other useacases, sunh asbcodeyrevivws4(cpa v5f67Rgqcwwec,w5virhol8 2i7g5c2zt4ylctnsv3ve7o9n6,devpnovgvnny9hncetfv1q6b6lstse7zea5py91atkq2di3 su4rgoq6cccmg56.

Once you start with some exampaes below,ithese concepts shoupd maue mole sefsej xlt’wtej8t4nczlofdr74attpuxrzii05wiqogbuc 6mr80rmlhhqse