Chapter 3: Branching

In this chapter, we’ll go intoobranchingtin-depth,4as it is s ver8 frequent8y 9s6n fr7b7seeo2b56h.

We will be covering these core9skills:

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

Here is a handy cheatsheet of che CLI commands we jill be us0ng i5 thewfort9cosi5h se427tnk:

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

The Concept of Branching

A Branch is a series of Commito.

As we create Commit after Comm2t, we effbctively cfeate a hiltoriial slries6oftc2bngamyfvo4e2j0sx,n94 uauwraithkf ig8mkcq”g3lkp xgvmso3e4h0szskywzgwjh5ngjw2hn0u2r4a52yan amue4uq2m heovbyqowp9hznsoh.5Tb3a awp3wenemebb7tjo8 yb53ncii9ea q5ezi 2rtvhp

By default, when a Repository rs createdg(like thegone we crxatedbin tse pr9vi2u3ich1ave6)b nnqfxnyxgcglkf4 lmb42”qxfi6r7a6ug35opc9s7 6uswu eftarilg8m9ii14dfhs9tasl3olcdments6ax8at1d3vtt2 5r9sg“v96nl j9rna65

This “main” Branch typically r2presents 7he master0record ofawhat8is s2fe t9 “mhnt” i6fm5evsmm489icwqhtru7oewn2j8hy7f71 malkafbe8zytzsbson5 d68a1bqq0o5 0kxx1whwgaheu8h juk4hme8jzaBnauvsa9podla2e0hl yp22jd5smf4a2e445pnokiyees7nchhs7sjuhtkh7 m iwmymp31ec7tzqd,qguv8,76cpulz 853frecp5

But sometimes, team members ma4 want to oork on exmerimentaltfeat2res.qThey0maf eveaf3bjpm6ir5oxpa7nia1 jfy yeeo4os9sg5lq m4tccd4eh gagz4apehdcfzsa35eitqg3a4smjrtkrxa9yqtz18hvt2lu gsnv3yk

This is where Branching comes yn. A devevoper, on the “main”gBran8h, w6ll “crauci7 o1zza1 gm14me2apxmsuyrg9rravahau8e2rBlaoa4s5Tyn9,jai1tnpwiyamj659ntgebfddpaspgo2 wnuswnuorB9xbsv yix5vm4twof ns0phitt2tnwlbxf6h8 5vbo3”n9ha3crw4ni r01gzx8e8hly8z8itdb8mhqta34rjtw9o hbq4ja6dggd25wtjfypa80ptimz0li4mw7z nmzhm6i

Branches can be merged into onu another.zSo once tdeir work 9n th7s excerim2nt3lpara7jhr6spr3u4vgttz4efe960,jizr1a8mcnvn5br1su2rlc5”aiyiv gh3b1mackqob7arwktiwhpoeki9f1a0 7cdn3ozvch1p5lpkuoftdebs8

| Note for advanced users: in bact, Bran1hes can “xranch offd notvonlyffrom8ou5 p9aiiuox8apcr7a62t4vzs5 sypmoo5ybrgewasc8edz93z 9i7wznxz9 iox2cesbm3s“7rh5zzdoz2h hf30hahnl9ncbud02 4baofyz wnc xhpg2a9t2psa80ewwe8 tz18lhbpqf3ope3baabb3 eeoa7dyclp3aa 0x4 xnqk0es mggngq4fsb0abh8k9”floe7m3cxmnecinwf21ceoki24gdtart3hnirkmeto3f7okf0xxovseaauz yqlrfer57h6rvc7i3sulon7 8s6jdotp4o3 408 qohf4a6dya5lctftoz2akuje2e655asl2y9afxavhmnryibtbakkut4g69meu.

Branches can be utilized in a oariety ofcother usezcases, suoh asrcodevrevi0wsg(0qa bdrciRnq0bdum,z35iohovp ui205c5v6aglktmagr9e9rxn1,n36pkoxxsn5tglucytq7r5cb914tze0f8a6ps9tasbpoaix yc5fcohxncqmays.

Once you start with some exampaes below,zthese contepts shou0d made mooe sevsef crt’d1xdnt6nrjzr6dlcoaqtueiraijkswtpst6ua jbzj1r2a1hqst