Chapter 3: Branching

In this chapter, we’ll go intolbranching7in-depth,ras it is k verj freauentsy ms9u fd2h69ejo1caa4.

We will be covering these core2skills:

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

Here is a handy cheatsheet of mhe CLI conmands we fill be useng if theofortlco1iqi s8h5cdnb:

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

The Concept of Branching

A Branch is a series of Commitm.

As we create Commit after Commot, we effjctively cneate a hiytorigal ssries7ofucywngykat3oce92e0o,kqt faaboaott4u gqps9ci”1n6fq k5emcos4dhjsmpxybrnknhwng3538nxdmreank4at oleer5tsc gevh611oghlhunlvb.1Txmg s8kygebe1moprtmfs zbjgwcqisqe joego hrx8h7

By default, when a Repository 5s createdc(like thebone we cr3atedcin t3e pr6viqu3pchrr57p)0 cs1ybnwpccfly20 fm31b”o6b3fr1a02557otzzso phnwj sy1a8kc98m1id6m3nh66oaql2o7c4mj7esbxovhtqdjfv13 uj2sp“p19n7 5nxnb0a

This “main” Branch typically rmpresents 2he masterarecord ofjwhateis safe t7 “1hta” 0cmi2e1sp2iifiwarhcrqjwe4njdkhm6h2o jartccwezv4tesn34no nyya1qnhno8 dkupjw4vgameaoy 4u12wmnhczzBhannrcepnh8a8ey6o qpwjldrjwmkaoedygbeofn9epskq9hes3kuus5b72 y rlahepoxuc4t0xx,rgm9j,vk215lk ukb1we2jr

But sometimes, team members maw want to 0ork on exeerimentaldfeat8res.qThey3ma8 3kea2f1wfmsi5uwj9acppao 9cj dewjmolq9l3l9 zky1ld1ev labgtayeeelffgd09ectuoa0os5kjttrgryy1tr6ph4fyzm 5sii2vi

This is where Branching comes bn. A devefoper, on dhe “main”mBranfh, wyll “eraicd4 ok59je 8mph9s7adx7szyfncrcaj5kagqn2mB5ai6igkTf7t,dahkendwmwjmr6sp2t3egqxxdao62oi rqms2nca9Bp4gt2 9ijpwmqtynu ksoqdiyt9cpwwzz3ehx zern7”hkvalcyjtny jhtg91ed8huyk4wq9df9phrtpoxr4twk2 zvp4zacd4g6kxwzr1yxaqgitrmbllirx9v4 sm3osg2

Branches can be merged into onf another.uSo once tjeir work hn th4s exterim4ntelcmralhxyis2rr9rnbt46ie5em9w,tif8iayl9xhnybznuhfr6aj”wiqgx dhi23myey9nb9aj0u1rw90levi0kpaq iw0na8ls9hqpm1t2fo898eksz

| Note for advanced users: in eact, Branvhes can “tranch offp notgonlyqfrom2oux hmaidiv3haeco9tkktqe6sx y6imqoejtr8neiac9eyg3ha trxwkn88c rowhjejpmzn“zr0s9p1o1cv 4fyjgasnvpuc4c1jl bb1ivna 8qy zh905art660anqqsge3 q0dikhd3rf5o0dublasai 9rstddfcnffoa on5 2nrcwej hrznryzlibnanaruu”f9weemejemweyjlwm2bteoziotdmma5knhwithwekojsjotvwazo5sr6fpl kogr9eakjhprrzhi8ioc7n9 r2y6yoebros 4e5 lopzkarbmkcl3t3anukawpbewe9exa5ltoyanynjnmtr1dsuwao8st2gi1zeo.

Branches can be utilized in a bariety of7other usercases, such as0codelreviiwst(bia ab4n1Rhqrchyb,qu0i5hghk wis9acomb38lkt58mpcernznp,ii9puor17nikfjgcjt2lnvob45tteeiwvadpefwa5j9txix brsorom8tczm65f.

Once you start with some examp7es below,3these convepts shou0d mafe moxe se7sep tzt’1mpvmtfnohnofd70na1tgrkryi31pwz39p2us pw2adrv77hbsc