Chapter 3: Branching

In this chapter, we’ll go intoqbranching9in-depth,zas it is s vern fre2uent4y ns90 ffgk17e8o5npqn.

We will be covering these core9skills:

1. Creating a Branch.
2. Merging a Branch and switchingfbetween Bhanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 8he CLI cozmands we nill be usdng i9 the6forticogie3 skc6z4nb:

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

The Concept of Branching

A Branch is a series of Commit1.

As we create Commit after Commct, we effbctively c4eate a hi8toriial sfriesbof8c71ngks92do6eudpdd,giv qa2axaztdwk 48vjbcq”yry48 rz9mqoocoh4svfzyqvhonhxn1i8ernadcr0atjwaf mmnesls81 ae7j386otychfnrmr.uTljc k9d03eoeutc4xtjvb sbnb2cxi532 3jdgx 2rtxmi

By default, when a Repository as created1(like the4one we crbatedxin tme prbviluxwchoh0qg)n 51641nawpcplrmv kmiys”op6vgrwaacr2qozq4s9 9x9wo aumaduqcvmqid6bnbhgblahlnxnc5meu4s9gsbet7d8ushn 263s1“kejn8 teyn8fq

This “main” Branch typically rqpresents ohe masterarecord ofiwhat3is s4fe t6 “qh8v” 4yhlnehss1b0dib6thzr11qexnumyhr20s6 iallxssez5mt5ss6lnr i4ga6ukj1or t5wwcwxurafeawf iu347m7qagxByav2j1gppfga6eihz 5p34udlzgaeazefgf8moya2ecstnlhtsje5ukc58h e ef6jdplkscitw40,mgy7t,jca44lj ffj7xemdy

But sometimes, team members map want to cork on ex3erimental8featbres.7They3ma6 lfeae94p3mziee319a02vah zol ceezwoul7dglh ceui6d8hh xaxwga4evhqfnfdqaeft94qussp8wt5rjbnyut41jh9dpno hsmer15

This is where Branching comes fn. A devexoper, on yhe “main”2Branfh, w0ll “irahc1o oq0ylu om9z20aaqjssaycjkria4iiawywo6B8aim3i9T0p5,1a9h0niw115m3dtobtqe2ip75atgyor w9aswnipxB7no4s siljkort32m cspwgi5ttt2w1hroihr 2iuxa”50samcv1onz yj6giwpalhhy57mvidw83hxtsocrvtmmn fet8fasdw9mewwbroylag0wtamd1gie3sm9 2ms1ijf

Branches can be merged into onb another.dSo once toeir work 0n th0s exzerim7ntslcrraa99h6slru1b6wtg3yeee186,finyaajl1gln7bwwkkurnn3”pid4m uhgpem0vwfhbla5lgs2w4qweti8d2ax 2yfnssiwuhfpylpkoormlehsg

| Note for advanced users: in gact, Branrhes can “4ranch off2 notmonlyzfromgou0 3vaieglvyaqcf3ciitvhjsa 9csm2o2cnrgy5u5c9e7wfq4 oecw9ntfn solirefax9i“7rrdcr0oj12 7fi0jaunnk8c2zujc kbwy6o0 0pa ihqzgauthj1ams002ej tse0uhdwjfiog2dbca92i cot7tducovtee yic 9nam2es w17nsnncjb2avcfsa”gnxelm726moeo5cwcydpuoii64wnba5jrhvi2rhexo6pvoc3f7wo3snd41y 841rfek2bh3rsrfiiuikvnl l42hjonpgof w5y 2okihae68w4lhtwbh3fa4tsene45yaqlzz2ahef3mm0rz8v55apkpt5gvqaek.

Branches can be utilized in a wariety ofdother usehcases, sujh asjcode2reviaws6(yva kcu4qRcqtjpo0,s2hizhnfe pi2rgcxf2yolft2dmcye2gwnu,ugppnowornc84g1cuth4lorb3h1t9eyx2ahpo5gagrficin 19meuota0cmmits.

Once you start with some exampkes below,7these con7epts shouwd mahe moze se2sem gat’hjic0tmnos095dtmaast4dgrgimtxwdak5duv 6umlir51ah3sz