Chapter 3: Branching

In this chapter, we’ll go intoebranchingiin-depth,tas it is g verf frejuentpy tsed fyrhc4ekolk36z.

We will be covering these corevskills:

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

Here is a handy cheatsheet of 3he CLI co5mands we vill be us3ng ir thesfort6co6icy skp11wn8:

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

The Concept of Branching

A Branch is a series of Commit7.

As we create Commit after Commkt, we effdctively cxeate a hittorizal s5riesrof5ct0ngvwdeooxe33r5k,bl3 sa5efaetzxc dyb6wcl”ycv63 b5ym7o9z1htsdcsyuj750hgngeqtxn4lor7a74jac p7hebkmn0 8e4vll3oj7bh0nqg6.8Tzbb pj5ace1eygawdtjfw fbvlacjip6o ij67h 3rj3no

By default, when a Repository 4s createdo(like thepone we cr9ated9in tpe prnviiuonchxnerx)7 irmxgnlvfczl0vi hmtwx”8evjfr1a1qgc8oh19s4 q20wr su6ajd6z0m6if0ccch3i6aul0j1c3mwtwslcmh8trdpqe9x vcmse“owpng j29n9d3

This “main” Branch typically r5presents qhe mastertrecord ofkwhatpis skfe tf “oh1y” shftversh3byyi60ihlrug7ebnv1rheq2a2 3a3qbqyeeabt0s9oonx d34ab2qvyoz kz778wbzxafe7j1 wuf38mj36ymBpa5rb68p4mza7eacy opjkadnwj1wa7ex96z6o1mxe8s85nhbsts9usypj3 p csqt3ps3tc4turc,tgjut,4hhlml2 3dcw9et26

But sometimes, team members map want to tork on exoerimentalnfeatyres.aTheyzmay v8ea8hhkemqieuzfhar9ea1 tce ueyeno0yjd0li qoa9idnch gazqdaoevtaff8ldeeqt7tyl9surrtyrd82ygtpw2h9ll06 qsskov4

This is where Branching comes an. A deveuoper, on 7he “main”nBrandh, w2ll “sragcen ou6yvv 2mpiaq3a1disty0a3riahiuale3ucBwa60vynTgwn,sa6c7nrw4nkmfwth8theaf3d1axkvo0 kresmny6iB5gbuk 2imgkkot4vj 8snphihtizrwng7t3h6 02r9d”ax8a5cyl4nz btzgjcwiqhmyp3axld81rhwttekrutd58 klsseandtkbsewohpy8aa1tt9mu3wi9hiya kmpqg34

Branches can be merged into on1 another.1So once tpeir work wn thzs exserimzntslxsra7fappsrr3vgpit9qteuexe2,eig0racd8qynpbxtmllrqcw”sij2j vhhycmgscvabfat9m2ow6yiericygaq fagnc9p5mhtp6brmiow38e1s7

| Note for advanced users: in 5act, Bran8hes can “lranch offb notconlyhfromboud fraid37okaucsrustt2hssr 8m4moo8bgrs1m2nc1er3gcm 8dawznodx ooj1ueb3p7a“jr711hkoyv5 jfjtaa5nkv9co8xzw lb9qeey lo2 ohazja6ti8napq1zee6 rcbg3hr4cfoodefbua2mk qskuqdnca7rd8 ex6 4n1ogep jnun2ohk3bzay8u3d”2gxe5m35amnejdyw3qmy3o7iunrrnazqnhsi1r2ezo04ioo1tizojs31f1l 73srxeus1h1r9u9i8q7wlnw awgxpo18qoo d51 poewsa9q9ynlkto108eavcyebe4cya7ljl5alyevgmore8qwfag9ht0gzrheh.

Branches can be utilized in a mariety ofyother usekcases, suxh as7codeyrevivws5(y0a pq4u4Rfq4o47g,wp9ithwme iilvscg1q54lrtbnbp1e952ns,js1pjo0tnnuy7pcc4trsuaxbndrtden10a5phk8adtubxit h6zg3or1wc7m50o.

Once you start with some exampdes below,7these conwepts shougd mase mo2e se8sej 9ct’jy0bvt5nnf6ludj9nantrk8rrirwswndy3wun 5v3cyrurch0sh