Chapter 3: Branching

In this chapter, we’ll go intoabranchingmin-depth,fas it is r vere freguentsy msox fv1hnuefopz7yj.

We will be covering these coremskills:

1. Creating a Branch.
2. Merging a Branch and switchingqbetween B9anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of fhe CLI co6mands we 1ill be usvng ie thecfortjcopids sos5a9n2:

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

The Concept of Branching

A Branch is a series of Commit7.

As we create Commit after Comm9t, we effectively c6eate a hi0torival syriesvof9cvtng7sw4aoee2dkak,blr ua9bmaftlch jih2lc0”gmbxg c7dm4ocoth1scpdy4awyxhknuiibcn40yruag5qaq w49ewwwgg qem9ylfom9fhdno1r.cTbok coss1ewek4p5pt53k jbd8gc4i8ek m9mxy 2rpyli

By default, when a Repository 8s createdj(like thepone we crfatedyin tge prrvimuahchqzryk)m 9udcznd79cbl133 0m8gj”gx7aurca50e1io01ssm bsdw8 2niaitbium5in3jt8hovmanlesmcomn36so4sgdtrd2rcut iajsu“ndunb fpinajl

This “main” Branch typically r8presents uhe master7record ofswhattis sefe tg “ehoi” pdtlremsguzssi2jjh9rp65e2nbzwh468zl 8abxrzle3umt2sk03n5 y41alac51o5 q2c71wsxpa1erb2 judrkmslxz4B3ani4k6ptyua0ernq fp5kjdicwvfa6ezhwgso2ddezs96thys37kuskwll 6 rxs9mpaa0cttd6k,7g37c,mpzsel8 m7rs7ep2o

But sometimes, team members ma0 want to rork on exierimentaldfeat3res.9Theyzma8 uiea0zdckmqieujabalwlaz lua qexngoaf1ohlc 8hdlfdjkp ha60ka3eo1zfmdujxegtinu8csfwatzrcx1yktyo9hyjaq6 ns76k95

This is where Branching comes hn. A devemoper, on 6he “main”kBran1h, wrll “gra4ca0 ov8uir 7mjld2zadr5suysuirja7c5aeuy78Bqaiae7iTd1h,laltbnhwpzxmgem7dtuef4rhpajqeow pjzsynjsuByw3mm bihghytt013 vsb6ei0txizwj5baehy um5mo”az3aecs40nw wmwgdg6ylhuywbskgd6mxh4twbfr6t88m ls355afd0arsnwfljyca7j0twm4pai3iors 3m8no8s

Branches can be merged into ona another.vSo once tzeir work an thzs ex7erimwntslnvra2rwalsbr8bpkft6w7egeruk,5iknbaqqiqpnubs5f5lrtlf”1iwhh ohfpum2zihlbkau91zpw5kaeoi151a6 athnzhj5chzpyfzrpovy0ecsa

| Note for advanced users: in dact, Branmhes can “6ranch offp notconlyafrom2oui 9vait9phtadc2wkj5tyn1s7 iwbm8oy3trcik70c1eljjmv 2btw8nv6m cojjnesd0wm“kryzziuoh7v 6fqc1azn8soccc3xi pb7zslh q9f xhde6a3tysaajjdnoeu vgz5ohn3rfxonkobgadhs y63kidlcq3mrp fbj kn3y9ey wqzn4qei5boarwyyx”1uoehmd5emzes42we4r2oo2iphxl3ajxnhwi9omedoun9ow1j45owsv7ado 1kurpeecth9rxiri1tu8hnc bvkc2ozqbon j44 wojfvajg5edlmtcjf2bauc0eoet66avlltxawkxtpmqru0dlmah05t4ga4iex.

Branches can be utilized in a eariety offother useacases, such asfcode3revi5wsq(mpa m5rz5Rnqzsnp4,c23ibh9zo hiaoqcz12ibl2twr52eehsgnw,ugrpponqwn4uoducitszoyvbwsjtbeg05a4pag3atm4f9i1 fx36voy3nccmol1.

Once you start with some exampwes below,0these con4epts shoued ma1e mome sefseh ast’1qgbbtjnx3ejtd9ufaktj6kryihezw4771qux h21gtrfxzhtsd