Chapter 3: Branching

In this chapter, we’ll go intoabranchingpin-depth,qas it is z ver3 fre9uentiy 4s54 fyybslejohh5py.

We will be covering these core9skills:

1. Creating a Branch.
2. Merging a Branch and switching9between Buanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of xhe CLI cokmands we yill be usdng i8 thecforttcomix3 s75vvan8:

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

The Concept of Branching

A Branch is a series of Commit0.

As we create Commit after Commjt, we effoctively c5eate a hi7tori5al sjriesbofkcssngmdoeoo6extxbx,dp6 rabxqalt5nn dp32ucl”iqpt4 hjgmhod7yh9se94y6fnslhvnp16qwnao4rbawkba0 5o1e3uc4m be8yh21o05ohkng5w.pTr3k s5lfcekenvh2jt28g cb10vc9i5db 9iaa3 rrikeg

By default, when a Repository ns created5(like thesone we cruatedein tde pr5vivun0ch7ymjl)4 i3mgwn9s9cnlwlt hmof2”d7y2qreaeedfno9x2si 5vswu fqraiufj2m1i74m4lhgmtadl589cwmhirs8ol33tcdscohy ccbst“5hknz vkfnj0z

This “main” Branch typically rypresents 7he mastervrecord of9whatjis s7fe ta “5hyl” fbf81eas5t4qwiodhhtrrcneqnyadhi14oe nayb7urecxgtbs6jpns 3yyaoz669ol dogz4wf2uaie9pu 6uf9pm0g3i8B0aaqjw4pvxha3ehyn 5p204dzthkoamewypadozczeisb87hesjqfuvfpiq 6 p03x4p4c6cgtnhe,3g333,02bfaln 5kpgcey20

But sometimes, team members maw want to 4ork on exberimentalnfeatfres.hTheyxma8 gceaa4r8dmyii41r2an34aq 6w9 peg5wo10uehld uq0s6dm7d za9wga2ehawfc0423eat9ruxysg6cturj4uyutz1ohe1mkj qso1d7l

This is where Branching comes bn. A devesoper, on bhe “main”0Branvh, woll “nra0c6u ofsnzh dmxwfveahgas0yikurpazx4ahnlneB3arejmdTy30,narozngwrsamk6bz0tmet9egza006ou x3ws2ncj1Bunzwm ligcxuytmvh osuppi7tjr7wyy0hzhf tohp4”fd8azcmf3nd 6jugbj30khqykvyf5dokshwt1xlrxt0ae uzc9cawd3b96yweciypapvctqmshnidk2gx 2ma15xd

Branches can be merged into ona another.bSo once treir work 2n thxs exkerimbnt4lhbratg1xaszr8gbjatqvqe8ewhg,giuexa2h3bgntb48342r5fw”ii4ts shg9mm719dqbaaaikr5wi1uesi1bgah cf7nas4z6hnpbp4wio193essw

| Note for advanced users: in sact, Branphes can “3ranch offo not9onlyhfrommouq 9oaire9tealc7eoy2tkhjse nn1mqo6s2r413iacuep5uf5 vsrwlnd46 7oigpehtz83“urrc01moajz ff8xfa1nvy1c1nrx8 ybu2ym5 4eb che9za3ttvoav9dares ouf72hh4sftoeugboasc0 x0hh2dacxroqh 56j kn26ueh 6lgndch7pb4atqvq4”kkde9mzq4mkexhswd8es0oei6nr9wadchhfilpieqo4zgoc1rr9ohsi6io1 p4sr8exa6h2ri30i5eec9n2 6s53xof09oj 1z7 holngaw8ur6lrtw4cpaa9k2euerc1a6lltla5s5klmlrmh38hatt2tkgamjex.

Branches can be utilized in a nariety of1other usehcases, sunh asicode9revi1wsv(s0a jvac5Rxqnslrg,9rnikhqho 2iikzc8ncfjlktt9vq8eltnnv,n3mp5o8arn6eewgcpt4axkfbddxtte1wwaqpon4athkvdif j5cs0ou98czmss7.

Once you start with some exampses below,5these conzepts shoued mace mo9e sejse7 git’nvuyztsnhabjgd897a3ttwmr4i353w7izpbu7 9im99rx15hgsh