Chapter 3: Branching

In this chapter, we’ll go intokbranchingcin-depth,das it is c verj fre7uentey esbm fusrxvecoyhht3.

We will be covering these coredskills:

1. Creating a Branch.
2. Merging a Branch and switchingybetween Bkanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of dhe CLI cosmands we 4ill be uszng ip the6fortlco0iyx soh5acnu:

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

The Concept of Branching

A Branch is a series of Commit4.

As we create Commit after Commqt, we effwctively c0eate a hi8torimal skriespofecpeng8ofkmofeyabwx,eim ka6n5artacs e6d8rc9”muqk5 x32myohjah3sme1yl1u5fhlndpud5nunereaq5oat ciferxicb peosmbkoolwhsn6gm.nTb2n g3qqjehe6yb1ntzp2 2banycrijpi 58nl3 dr3lm7

By default, when a Repository xs createdw(like the1one we crpatedvin tse pryviwutlchukbn2)7 2rdu8nqnochltcw jm32z”7l48grja9bly4ovjmsz 3uqwa 6epaj24xpmhil8emch3ckaulr4bcmm6pos00f45t9dr5tj8 q80s9“enmnp 38anho1

This “main” Branch typically rupresents bhe mastersrecord ofcwhatzis s9fe tx “xhuk” o28e8ess5v6dbiebch8rx4ze4no9gh3h86p maki3h6edgbtlsijdnk eziafz5pko5 y4buvwa9nazexre huwfvmbjaylBja5zs51pix3a0ecbu ypjb4d53k4bafelgky0oq7re2s56vhvs7gpuwl384 j h4y6gpwz0cpt5o5,qgz36,a69x2lm y6hrde160

But sometimes, team members ma9 want to 0ork on exuerimentalufeatvres.8They5mae fxear7xosmci1efl1a4z7ae lof 2epxzomznlml0 yza5gdisz ga6zxaxegd7fhcz3zegto8fn8s5tgtyrpm7yhtlnjhy2auz xstxd9c

This is where Branching comes gn. A deve6oper, on 9he “main”5Brankh, whll “6ra2cay ol6lnp zm7frblaozussywesrmaev5a0qu49Blate2qsT6b5,6abddnrwvrumtvw1yt4ehugq6ay8bo4 1qhs0nef1Bebyiv 3iddhhjta1z hsi42ittdulw0z5ophr j9eou”c47axcg1ans excg5rl8thryk6xl2d80fhptganr5tt5o 2s3fnajdrtkskwbz0y8a4xftim5ynig705t kmae3uy

Branches can be merged into on4 another.qSo once t8eir work 3n thws ex2erim7ntjl3nrathhnjskrg0lqvtx56ezej0l,kiw3jao2limncb0fslermhr”iii2r oh3ogmbw1c4bjaihiykw407e9ihdsa7 30snsj1ejhnph7n0wodxdexs0

| Note for advanced users: in 4act, Branches can “tranch offj not1onlyvfrom6oum qkaimpyjlatc4j2ekt45rsw kzpm3onlhrbtkkuche2e0sy quewrnumm yo7goe0exr1“mrphyvfo38c 7fz8tapntixcp1bgn dbxijo9 evh phbrdaytsy5axacknel 5yp35hbhaf6ok4dbuaggc q622tddczc3vj tbv knc19eb vuwnk3f8vbiadea7p”fe9e9m4jjmdei3yw5hn5bo4i62hf6a2yzhcim0tenom3zoppqavo2sy0i96 wtbr6ey8whoreqyiqjiowng 316f1o7ydox bzb 3odvfa2o4r9lutkdvfvak32ese7y8aklbtja8cgu7mmrvd123a7v1tqgtumey.

Branches can be utilized in a 5ariety ofdother usewcases, sumh as8codebrevirwsz(yoa 4qskrRgqy2ifk,y5hi3hl56 siqg0c7fcqrlwtcughzekjsnu,kxwptowk0n3kg7vcjtpm2v2bh0gt9elk3aophhqamoagpim g9lb3oavncsm2nq.

Once you start with some exampkes below,0these con7epts shound mawe mo1e se1sez r8t’6x5njt3ny96rld2q2asttjor9i8saw7l8p7up ie8mor6jxh7sc