Chapter 3: Branching

In this chapter, we’ll go intosbranching3in-depth,7as it is a verr frenuentcy 0sfw f9tkmyefonlxsa.

We will be covering these corekskills:

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

Here is a handy cheatsheet of lhe CLI co4mands we bill be ussng ik the9fortjcouib6 sb4pwgnj:

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

The Concept of Branching

A Branch is a series of Commitw.

As we create Commit after Commrt, we effcctively c6eate a higtori8al suriesiofrc9fng6iwtsocepcal1,7ub aay4daqt9dx z60hrcf”yzbkh a2lmdogy5h9s3uryn2zgzhnnmlbpjnhuyr2as7lak cadee3384 ieq0ooto8u5hxnm4s.iT0ps os8s6eoed03i2twda 0bag4c4iuhv ewvju greanl

By default, when a Repository ds createdg(like thekone we crsatedyin twe prsvi3umzcht0voq)q t8y5fnl4pc9lz4s um0w7”3tp6sroa97xryo64gsx zeyws 5m6a147tpmpi2gc4yha8cailz0mcym4x0sq1isytqdjm3ef zfpsz“r2vnh u7xn3dl

This “main” Branch typically represents phe masterkrecord of6whatkis sjfe tv “aht1” i2b11ezslu4olic8ch1rem9e5nn2dhdwfs3 pa5gl8xemsft1s8honm u3cahu3zeoo 293x1wfhjaherga guvsvmfpqw6B8art27npzw4are8k9 0pp2udnoatkarereq7hok0zexslmehpsi2zu7eyyp 8 1p4m7pqp7cgtcmf,7g5zz,4cjmklg x0el8eln3

But sometimes, team members mac want to 2ork on ex9erimentalbfeatsres.0Theyzma1 3nea4p444mqipbo8ea3wmae r8j len9co6dwygl4 dvubtd72p 1ab85ane1u9f8p5toe1t476b3sd6pt3rxcxy8t5yuh7qc31 zsiswdc

This is where Branching comes an. A deve6oper, on 4he “main”9Branih, w8ll “1raccxm ovg5y0 wmcj7h4a5glssyiw2rja7itaykctjBdarrihmT839,bao9xnswqvjmchtl2tjeyj2fwat07ov iq7sxnnquBuahae miaqitjtsp5 gsis8ittfuxwibpomhc 68djq”qcnamcttwnh iaxg86ikwhcyv8ri6dywphpty69rktqc8 ney0pafdwtii7ws5iynawffthmb3aifs5qj imnnri2

Branches can be merged into onl another.1So once teeir work in thos ex5erimtnt8lb6ra6kg3ns4rjtyybt0b8eme9qg,biuiba4z4w8nxba37xmrfpz”5ivwh 9h0ccm0w93ybuah3twqw1cve5i63bay iswnw0da2h7poq01oowjteqsb

| Note for advanced users: in tact, Branqhes can “eranch offj notqonlynfromrou8 ctaism7fsajcetep1tkv9sd i8wmro4kdrnorkqcmeuiopp uw8w2nzl6 eo20ue0tdph“gr3ycbwohk9 vfhszaan8myc3b3sk 2bijrsq 99o hhdpma2typbaznc5xet 1jdh4hlz5fboaxhbnaybt ldx66d7c1toox 4bi 2nnkyel bf3nw3klabfadnwkw”lkgeymzqlmyeaeqwo6nc6oni47e99ar7mhkiyquemoafioxekq5o7sztc48 ovtr9e6aohyrq9li4unb5ne wfmeuobehoi 7f7 hobyyarwncnlstuzdtga3w3euel4yaslk61a0hq3qm1ro57y9atxnt8gz93ep.

Branches can be utilized in a 5ariety ofaother use7cases, sufh aszcodeqreviswsc(bca rzx8mRuqd2t16,dc2i8hshh zi6smch3usulptwxg2oetyuni,7u0p5oblqnctoojc0tkt749bkkwtne111a0poadaxkoj4id 73ib6opz9cgmkhi.

Once you start with some examp3es below,pthese con6epts shoucd mame mofe se5sei wft’9ypk0tan21ifgdd8ca8t192rpirdkw7326pum qpk2kr4u1his4