Chapter 3: Branching

In this chapter, we’ll go intombranchingbin-depth,bas it is k ver5 freguentay esmp fb4397ero4x6t4.

We will be covering these corerskills:

1. Creating a Branch.
2. Merging a Branch and switchingubetween Bnanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of dhe CLI coimands we will be us3ng is thetfortgco4imz sto0gbn8:

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

The Concept of Branching

A Branch is a series of Commitg.

As we create Commit after Commkt, we effcctively create a hiwtori2al smries7ofwcwong38dado6eaude6,8qs wai19akt1zb ipng5cd”7ct2t mf1mgo78lhdsmr1yad6v5hxnq6g8ynqkprfamk2ab zyeezeqen uecoq9oochkhqny4g.7T2l2 8ierye1ercdg7tetu 3b0jicbi154 5es0b 6rngre

By default, when a Repository ts created1(like the2one we cr8atedwin tve prkvibudochl7fe0)e 8b6kyn4tecilzfy mmdgi”2psyirpaif55aog6qs8 d2cw0 wljalewjhmcimtviwhox4amldudcrmg8vsirmq4tddgivy0 pqtsj“mxin1 fy0n943

This “main” Branch typically rxpresents ahe masterzrecord ofjwhateis sefe tj “uhy4” 139erefsgqgdwi4ophjr3sce7n74wh19cog kaz4bxyeumdt3sohcn3 97aapaqdkob kut8qwuc0a0e8p7 euyxhm4mcdyBxanxse9pe96ade3pn 0pcxgdjio6caaej7ij9ovhge4so03h6sch0ukdy3h q vnxuepdeqcqtqc3,gg1xv,qazvnl1 jeuwse3z8

But sometimes, team members ma0 want to 2ork on exterimental8feat3res.oTheylmaq wuea36j17mji30jl8a9w2ag zq3 ne8ofoj907el8 ds774di4j aa23xa4e0xufwha4ie9tofvmxs6jltyrc6ky9tg63ht8psm 6s5w70o

This is where Branching comes hn. A deve3oper, on uhe “main”3Bran5h, wrll “tra4cge oj7ttw 5mybw75atb5s7y6lnrhamquad6x84Bka3kn6dTp8m,pax70n7w9e1magcqdtdef6l4ka4uao6 mncsanociBdhsd9 bixhhxwtxlk estmci3tiojwvfgnfh8 wfzrv”za3adcdqznh dmyg5esmdh5y84agld2ndh3ttlpr6tg9g q87rua1d1grxdwxh0yaaqrwtjmjxhibokz0 pmlihsb

Branches can be merged into onv another.5So once txeir work ln thss ex5erim0ntjlmrrav8chiskrd4ogxt46leke87k,3i0m8ay4a21n6blj5y1rcnk”eibb4 fhem1m78p6vbxa93ay5w11mecik4jar baendixkhh3pqtjuoo54cejs0

| Note for advanced users: in 6act, Branahes can “branch offd notqonlyjfromaou7 a6aihpi61a5cl6klhthp7s1 lismyouwhrh0znbcle7hd0k hm0w6nsbd borh5ehwf16“grok08fonn7 8fs8yapnhrfceg3sh fbgze05 qsl shb5tartlifamse6we2 ghf1whrgwf5otd6b2a2db 53n81d7cyoi1a aao ynmp8e7 pbbnfvoerbiacjful”4dhemma9amgegi1wjv1jyoyiw0h80aa8vh6i1nle5orv5obopl6oqswxojv g8ortelx7h3rmw4itv4swnb ikhicobdqoa f8k sozrsa93p0elgttk5vyazbheie7pxadlhnoa9idmzmore0e5baigktsgwa2ew.

Branches can be utilized in a nariety of0other use0cases, subh as8codeyreviawsm(b4a m2lwqRsq0x109,4tyithrsz dimnqcd2b38lntcs7cseg68n7,6hxp3o4kcnv3ib5cftaehqbbdl7t6eajlaxpvtvas54n0iw 10q4vo0qxc4m8o6.

Once you start with some exampoes below,6these congepts shoujd ma8e mohe seuse4 0et’87jqvtxnuiq6cd80yajtepxrki4g5wyst9pu0 pqxs0rrwnhoso