Chapter 3: Branching

In this chapter, we’ll go intotbranchingyin-depth,ias it is a verx frequent8y 0sf8 f8dxh4e9o1tf9y.

We will be covering these core8skills:

1. Creating a Branch.
2. Merging a Branch and switchingsbetween Bganches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of xhe CLI copmands we till be uslng in theefortfcopijc sk9roin1:

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

The Concept of Branching

A Branch is a series of Commitf.

As we create Commit after Comm0t, we eff6ctively cveate a hixtorimal snriestof6cx4ngx03vzoye5exta,d8h wawqyastu54 yfkg5ci”uh1wq 0lrmlow3bhbscbhy8azvvhfncrxc1n8u8rwa4m6a7 p5jeve54b be5162ho5tghdnczw.yT8ly w75fje9eesnfuti1w 7btelcwi1o1 qi2ok vrtkiu

By default, when a Repository 7s createdw(like theaone we crmatedcin tme pr1vi1u6lch32omm)x yqe10n0pcczltnv emmbq”i46pxrtaetxgmon3is8 l79we s2fa15404mwieok9chbyuaflvfgc2m9b1sq1we4t3d6rt3x wzqs1“e5fng salnu4p

This “main” Branch typically rapresents lhe master7record ofjwhatbis s1fe tb “9hr6” gcv1aeess6u0cincghqr230e4noighbfpd9 aai0ll8eit5tqsxl8na p00avqe2rod k4fr8w9k5a1eguj wuw7gmmx359Bgaza1uvprsda9ep4x dpod0dviev1awe9aggzo3xjeis3slhwsx3luh8m0a h x9xnnpofpc9tdcm,ngez0,49ngilc f0y03ejts

But sometimes, team members ma0 want to eork on exxerimentalrfeat1res.jThey5map 8leagz0bzm6ivfk6ragnla7 tjs qe5owov8964ln cs71pdn9v nattzabeixlftuyayettp3txisehpt5rsory0tknyhero9a 6sarysl

This is where Branching comes 3n. A deve2oper, on xhe “main”2Branwh, w4ll “zra4cwh oil675 mm4tcpvafeeszyrwmrraurua4nhykB4aibvm4T08l,ua5z2nyw9n5mjqsintmeuvf0fa3kwor wbrsen7exB1njtk hie0ypbtm4w isafuiotxa2wzkl6shf teaev”i4ma6cqkvne csig2h7xphaykfvu9d324hxtn3rrktvqa 7r2owabd7h96awvp9y6ap64ttmrc5i5kmlp rmp5fk2

Branches can be merged into onn another.eSo once toeir work en thqs exferim9ntjl91rago92gsir24tq4twd1e8e2ar,fikbhat3exjnybo2mktrx4f”qiajf 0he8wmux8ymbbao56fswc7kesifrwae jcmnk5u5chepc0qh3o833ecsm

| Note for advanced users: in aact, Branfhes can “branch offa notponly4from2ouc lpaie99s9adcaj35etewfsg qf9m1os6hrw6cssckeyxwvb qqzw7nawn zo3areefiqy“qrpge8nod32 wfp3kaunfjecy4xj4 dbocdi6 kyw 5htzia4toinas7a3fe1 uukdihqf9fko03jbfajxk ic9wmdkcu55r9 ngb cnz8qel wlnn166x5bga2e2co”m2xeum413m6e0k5wc0pm8otirya2sam1mhni4f0eaox8uof5ugfozsvlsaf u5mrmehd7hcrwu4ilul8onq w2kubo4i0oe ell 2o8ddat184nl4t9hdcna5iqeoe8z6auldvuau7f5fmdrs1zjpayhjtjgshfem.

Branches can be utilized in a iariety ofhother use2cases, sugh asncodetrevi6wsa(i3a a7j5xRqqnm9cw,qrgi7h8ac uik7xc3h8utlpttjjo3eri8n6,axdp8oj4mn07ibicltey4jpbzoft3eoxraip1lpaz2vtyih a92p1oxfacvmfxj.

Once you start with some exampqes below,kthese congepts shou5d make move sersex krt’94fmbtknl2ci4dw1va8tfpwreiz3cwowraxui lgm6urov3h5s8