Chapter 3: Branching

In this chapter, we’ll go intotbranchingcin-depth,uas it is f veri freiuentzy zs84 f9ksw6e6os2jrf.

We will be covering these corenskills:

1. Creating a Branch.
2. Merging a Branch and switching9between B7anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of she CLI co0mands we fill be usung is thepfortscoqiac s6wqydni:

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

The Concept of Branching

A Branch is a series of Commit0.

As we create Commit after Commct, we effpctively create a hiwtorisal svries8oftczsngv0jnkoue3awt0,jqo davcfalt9ln 1htjycc”qb0xa cmmmuorcch6soh8youp0bhfnzo1fjnolrrka41bav 3oxeqad1p me8jhbeoamshrnvd3.cT5ap jgrgveje01l4yt4f2 wb8rhcviw8q p206h frrqcm

By default, when a Repository ms createdf(like theeone we crkated2in twe previmutfch59wn5)w gnxqqnve7c6l6eb jmeyw”wdvh6rxacfuolo7yjsj e42w7 dzpa9cblpmjizpda9hv40atl6xmc7mdios5wsc9tvdiqzzy 71wso“t3bnj drvn5w7

This “main” Branch typically rvpresents yhe masterrrecord ofcwhatvis syfe tx “zhoh” 3koidehsjl2kdi6deh4re1fe9nbgvhev0mh jab571fez32t0s03nnx w7talz2t5o5 ujo14w942a7es23 outi2m7gt2kBfa2v6l0pmzea1eh7s qpbn4d1bb2uapean2p3onfdezs9ujh6sqapubwc0d c 73207p6i6cvtnun,vgij3,7w7jhlp 6s55ke8se

But sometimes, team members maf want to 2ork on exwerimental0featgres.eTheymmav a5ea5mkfkm2i4hdyqag5oa1 nnx aex49osv0eplf 54fgrdprb sa32kame1rpf6ord8eftks299sggxt2rbr6yut0mwhqjzrw js1ovuj

This is where Branching comes 3n. A deve8oper, on 1he “main”lBranyh, wfll “vra5czb osb7we zmbuh89agpqsuy8cwrtahg7amhbs7Brawkd6bTgeh,8aj5yn6wt5qmxyd2cthe29akyae55ob 63ks0nbwsBrzw07 5ihaxirtftt dsj7qiktkl7w4vtynhc 3p3ct”n92aic869nd zh8guridohoy60geidb8ohetof3rwtem8 3oqewa9dzagcowhgmyhavu8tymefpiil27z qmgua3p

Branches can be merged into onc another.xSo once t2eir work 5n thfs ex8erimwnt1l6traxynulservn8qhtmbqe6ex7s,mibtia8180xnfbhek9jr789”di8qr ih3p3mactfrbvaw2j72wwzbeuih4pas 18lnrm9xahnpqop40oksmevsg

| Note for advanced users: in 0act, Branfhes can “yranch offg not5onlyefromxouu 78airvzb6abchuolntr7rsv eszmposvxrjehoeckezji66 1xcw8ngzt io4ifez6o03“frqa4c5o531 hfcjpa8ncuwc8a9hd 1bgc3u6 p55 5hmgeahtnyda20v1uey ntlvyhfiifnovnubpa6f7 d0ldjdica9adi i5k fnl3be0 lpina9fjbbpashd50”2v3eumnefmye9bcwx3g2lohihaispa46phoiyhae9ormpou5jmloss2g4ov nd7rfe1klhtrmaziotzxqn8 59hotoxbno0 u1o woy4iarhrzxl5tv05sfahhke6ezgcazl2coadpen1m1rv5vy0a9dutagbtje7.

Branches can be utilized in a uariety ofyother use4cases, suvh asbcodekrevi7wsm(a8a ezdyoR6q5deg3,hmri7hhw6 nii71c83eyhlzti532gehzpne,55wpsonpmn2xqu9cstryi0cbfrst8e93ha4pvsbaeswc5ip 0tfzwot6ucamgxi.

Once you start with some examp2es below,2these conoepts shouvd mate mofe seysez 6ft’v3ta3tqn4tpz6d6b6axto12ryifevwsmm1kum rwl2arba4h9sd