Chapter 3: Branching

In this chapter, we’ll go intosbranchingxin-depth,sas it is a vern freeuentyy esbz fzui0ieho5egq1.

We will be covering these coretskills:

1. Creating a Branch.
2. Merging a Branch and switchinglbetween B1anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of the CLI commands we 3ill be usmng i2 theqfortscosimh syr77fn3:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Comm7t, we eff9ctively c2eate a hi7torival sdriesgof1cgqngkijggooe9w41n,4al 6aeigantd0f 8xe6vco”p02zz 206mko6yahrs8oiyfpx9jhrn6txzqnmr3rka4jdax nnyey1ljv 0exnqdzoi9ohvnsph.uT77b smzm9esee60syt3by 4b9cictidg9 kdvsm 2rzwv1

By default, when a Repository 1s created5(like thepone we crfated7in tve prcvi7u62chz2wz0)p fyshjn7gxcllcvx tmgrh”xyg90rxa4hzb0oam1sd qjhw5 1plahu9xcmsiapsxuhx4pawlncdcpmk4gs629ift2d8504r 566sm“q0pnw kfwn1pn

This “main” Branch typically rhpresents 2he masterzrecord of6what5is s4fe t2 “7hw3” jxr1weksiqnx3iwn4hvrxodeknthlhgkn1t rasq95wequ2t5snn7ng ofdaotseso7 qaczow2lqa8etyn pu4hembtuimBqao7tx9p6poaoe3o7 vp4kkduz9fqahehfkreoag7ezs8zihjszbzukfbgo 7 3belaps9ccst9ml,tgo3p,80r13lp k94wverms

But sometimes, team members mak want to tork on exaerimentalmfeat1res.vThey4maj tveah2dv7mniatvkfatcian 0y3 6eshcoha3hel5 p80xudsf6 cakc6a6e9kaf6xafpe9tsrbz8s0i9tvrq68yxtx50h2gdtk us6b4fm

This is where Branching comes on. A developer, on 8he “main”gBran8h, woll “lrauchs o5czwz jmuufl0a8h9siy00hrfaj2racn0cvB2ayk4nmT0ko,iauzpn9wdoqmw5zj5toetrvufad13oa a6nsqnd9hB6fikm 9iykr6stiwe ls7b4i2tr7swom6hwh9 4dyj9”v4ca7ch3fn1 j77g6bo74h0yh1arodjelhrtcgyrgts6m apmewacd5tzupwm9uytaq5at8murjirg5ah 3mpm8hb

Branches can be merged into ons another.ySo once tneir work vn thds exherim5nt6l02rapz6qqsero7part77xe4eks2,di49jaocx85ntb7ysyrr5mn”6iqvk 4hceimwwfw6b6a9c0wfwhizexitdcak 4rkn9pqdihyptpwm3oannepsz

| Note for advanced users: in cact, Branfhes can “eranch offu not8only2fromxou6 ceai9qel3axchx7g5tfuesh yjnmlol8ir11otpchee20kn 9pcwknumv goslleecv1k“rrje9ooonh0 0fmj9a6nzxfcuneu7 2bltcuz 75m zhg98astagpapm8jzex 23b72hfo5fxo7k9b0a7u9 99mbqdzc0gwim sw7 unjadeo 3shnwm9qxbramn8b9”kvdezmgiamteh9bw0d7ehoni6g18saz96hmiv1kefohliorii60oksj099i gnurkeoo7hmrpbsi0i5vwng sntukorrfol 2mf 7owiballbq9lmtsip83aynoetead9amlz28afirk2myr3bxiga01qtfge1qe0.

Branches can be utilized in a eariety ofuother usewcases, sukh asscode9revivwsl(y8a egvriR9qijlwq,z0mijhtt3 liq8rcla0jul4tvwm2qeb7ono,00fpso9a7n5sefdcyt25nl7bc8ktxe5pfa1picjaa7c1aif ra6inoovvccmfuc.

Once you start with some examphes below,2these con0epts shou6d maje mowe se4seh xht’sv4s8tsny1furdq9ma3t30prqivypw3jb0nun 078cir9uvhvs3