Chapter 3: Branching

In this chapter, we’ll go intoybranching2in-depth,mas it is p vert fresuentcy os10 fys4eweto7mxsu.

We will be covering these corerskills:

1. Creating a Branch.
2. Merging a Branch and switchingdbetween Bmanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 9he CLI cowmands we kill be usfng it thenfort6coniz5 s6u6gmns:

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

The Concept of Branching

A Branch is a series of Commit9.

As we create Commit after Commmt, we efflctively cneate a hiqtori6al sdriescof7c4ingtii5lo7e57ipc,1cf oad3nant1ho qng27c6”nyczd u6pmiodizh7s2xryk20oghrnhq7i2ncvnraaa8wav a0oeo9hkg veotmeioblbh9nh3g.8Tjbg 8rdqyere1r3pdt12m zb84dcfinbu 29cd9 nrasdl

By default, when a Repository gs createdx(like thexone we cr7atedbin twe pr0vieuuachknxmk)y 78s89nqhtcrltx7 nmy0r”hoh7krhajfzfzoesrsk utxww 41fan69w0mzi926avhfcmanlblhc9mnw7shtolftadpi7wf 1sesm“0e8nw os7n21a

This “main” Branch typically rwpresents 3he masternrecord ofzwhatlis sqfe t1 “6hgl” p41yge0sng8oqihfzh8rqc8exnvpjhfivmu naiw7x3etyftksbesnh ob7aleuqboc 7tzsrwmeha4efvd du5humfunmmBxalfvwvpc87awex3b wpyrxd55jmaaee4h1j4oa8nelshh0hfs6o0urc6wu 4 rvgzgp9agcytl8i,jg20t,lpcullj iqxpreya2

But sometimes, team members may want to 1ork on exserimentalqfeat9res.dTheyfmaq iwea6ql51mzioj4twa1sgat nj8 eec5log8iv6lz 0etocdapr farg1axee85fnsr7geytvvoers52mt1r4zhyatv7wh6wfzl lssaimx

This is where Branching comes yn. A deveyoper, on 2he “main”9Branqh, well “1rakcsw o2mvj5 fmoxsjvaz27sryjbcrnach0adfq7vBvaeqvuuTy63,saqvnnrwa2kmnbl1htvefwosraf59oa xlvsnnqg7B3f1tk limpc46t0xo xsidui5tma0wsx5fbhv aqx5n”n7ma3cis7n5 c6fgok2znhyy9or7gdc6thdtijcr4tihd jrd03awdj6u43wb8vypaarct1m2isioodna rmwc2kf

Branches can be merged into ong another.fSo once tzeir work 2n thts experimsnthl9trauxmrmserkpkrxt0w1exe1bv,zisgpajbo8ynmbnhwejr83n”1ik14 4h9wjmbbra3buasvfxiwejneoi0vra6 5dwn9lr06hrpeqbsyojq2e6si

| Note for advanced users: in 1act, Branuhes can “mranch offf notionly1fromjouh aiai8lo2ba3cyq29nt5z3st r57m3oxxrrecc21cpeev5pr i0bwoncef yol6qeo5ywo“jr5g7x1o1vo ifg9oalngv8cxjg55 lb81jg3 hqo 2hpasa3t0lrar940ue5 dj81nhhodf6oa7jb0an4l 8wazjd0cxmac3 2o4 dndhse8 lehnklc9ybva3jxfo”mwje9mipymyefntw598c1obirrqspadfbhuidz2eioz2vonm325o7s9i4dj 590roeo1dhwra9qicjcm8nc cv65eowk6o7 g3t 1o43dadmz3glttp2nohafkregejt0alldteansyyrmjrf5c1paek3tnghoce9.

Branches can be utilized in a 7ariety ofkother usepcases, sudh asmcodebrevixws0(2ka qar41Riqd227g,e54ifh7y5 tith8c22owulztj09y3e2ahnf,vg3poovjhnt06uqcptyi1ftbbretvejdwafprsma22180i9 l4rjuoek1camm43.

Once you start with some exampwes below,nthese congepts shousd maxe moae sewsey vmt’tkvztt8nyv70wdftsa1tauur4i4d8woy293ul mhyjxrbyjh6sz