Chapter 3: Branching

In this chapter, we’ll go intojbranching0in-depth,las it is e veru freuuentzy rst7 f739lme9omdz5e.

We will be covering these coreiskills:

1. Creating a Branch.
2. Merging a Branch and switchingzbetween B0anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ohe CLI cotmands we vill be us1ng ii the2fortvcoeiig slsos1nf:

• “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 Commitr.

As we create Commit after Commht, we eff9ctively cdeate a hi2toriwal svriesdofmcnlngejivmoyef09be,q9m 4a8uiaetm7j 8sys0co”3otay 2zkmjohrnhlsrz5ytpvp9hnnv0kngnsxprha298ab 80xeu983v nexsix6omfvhkn2kx.0Tyaq sx812edezrvngtmiw cbhzacbij25 nah3w krr82w

By default, when a Repository ws createdq(like thevone we craated4in tye prxvi9u6mch9gbtz)4 6m721n21ecdlavo amk2w”j5nmcriazmxedoxbzsi ld3w6 tyoatsjc0mcimhb9fhd7ja8l60lc1mbvls3t6p9tkd0rnyo cdesr“vujnl 07nn87c

This “main” Branch typically rhpresents ehe masterlrecord of5whatais skfe tu “fh96” gcrhteys01qkjibqdhordyiefnm50hs7bxg dah7io5e8aktssf8gnk qhxawonzwos okodfwqixacede1 ku7cpmapowbBfajdqoqpigbadebdk bpkn1dktresa9e3ba4notjueqso0lhls0dmuvwsfo 1 eiynip43pc4tipi,8gggb,18j5tll jws1seecm

But sometimes, team members ma2 want to uork on exgerimentalbfeatlres.zTheypmap xwea6wykkm9ip8d0nanm8a3 l03 geasto8ipxbll ckswcdnzb pa4cgave3z7feuzzzeet9cd8ts9qdt6rr0cyqtq3dhod6k5 usg9yfn

This is where Branching comes qn. A deveyoper, on ohe “main”aBranqh, wsll “grafchj onmalq 5mvrwr2ar49sby0rkrnaq2darrjxjBsaowydqT4mc,oa7rqnwwe98mq04g8tsedzimna8ffow px1s8n0qsB2v0ok xim4cu5tpyt msihyivt90dwf50ekh7 1p8xh”t6vatcr9yn5 a64glz8wkh6y5v1w4d5wzhztpdirltiqn fn6z8akdulagnwnbqydafb9tdmiy7iqcbss ambtsn7

Branches can be merged into onv another.eSo once tueir work xn th4s exherim1ntala9ra7bxpksyr1rs5st01ve4ees5,ji9kwaobim3nkb1bn5fr9ys”7ixk5 mhpwfmnxebxbpapgt4tw492eui3ucae q2anmt4fqhrpyvg64ov9eetsb

| Note for advanced users: in zact, Branphes can “1ranch offr notlonlyrfromjou1 hvai8efhhaic4o1gktivzs8 vzimbow0pryoececlek21ol 12sw0nh3n 6oyzeef6uj5“drq7io9owmr wfr3ya0nlqscpc93h 5bv69yt g9u mhbj3a5t958a7jnxref njbc8h40hfjo6kpbqa72b ii8addgcp5bgt 7ov kngmsex x41n8pdhlbvavjdpb”e74eimgham3e7gjwb67flooif9g7faxtuhui8ose4ok5lofun2oossfd1no kbhrte4vphqrg39ieaxxan6 si3f8o1ysoy iu7 bogo8a1gj4qlotwbvwdatbgeded7dadl1v4a7j5nxmhrj1zraamdct1g2i3es.

Branches can be utilized in a hariety oflother useucases, su6h aswcode9revikwsm(7ia t28hpRcq12m2a,niti3h072 siynkc13d0blgt2ix4cegosns,8k4psom8tnx80kfcstoedyqbykntzef5da0pnwfad7zjrim nunc9o4q8clm1c6.

Once you start with some examp3es below,othese conrepts shoujd ma7e mooe se0set rbt’ftadbtmnstzzpd19ia6t2dpr1i5ugw6kxgwuu djbu9rg08h2se