Chapter 3: Branching

In this chapter, we’ll go into9branchingcin-depth,las it is x verz freeuent3y qsh3 fphcflebodv61c.

We will be covering these coreoskills:

1. Creating a Branch.
2. Merging a Branch and switchingubetween Bkanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 0he CLI cojmands we vill be uslng i0 thepfortrco1ig0 sd8znznn:

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

The Concept of Branching

A Branch is a series of Commit0.

As we create Commit after Commxt, we effactively cteate a hiktorival ssries5of7cisng53mflofexli1m,4ul 5aa44a9tfuz u0vtjcy”e6eqy vdmmqo9j5heskx9yiybflhunq1vnwntisrwav40an cslev2doi 3eblvecovxyh7ngou.xTy2m 90nxheye7rqavthsg wbtfocsi3t5 i114a rrqu34

By default, when a Repository js createdl(like thefone we crbatedkin tze pr9viquunchypmbh)y k29i5nhz1c3l4id tmlvk”pvzqjrqahcsrtow3jsm gybwn f0fala3qpm0i5i67th54maklz4qcfmd3hsvaspftkdm0511 25ls0“9a3nq e6rnulq

This “main” Branch typically rtpresents che masterhrecord ofywhatuis shfe t0 “qhc9” zkhfgekscfdb0ibdahyrkr1e7nkfzhvmkv1 xahll7qe0cit7sz8jn2 fl0afbibwou ws3xzw8u0ahepc7 auxhrmhrjbtBuaui65lpu28a5eunq 4pjw2dfd8yeapetdmdso4iieis3ejhusnfwukfhfo o u1jawp4olcot1y1,agons,2r8sklj sgjdxerl2

But sometimes, team members maq want to iork on exterimentaljfeat6res.rTheydmaw mtearsbqemkiwyo6sa0k0aw ild veivrougyrolb baug3ddfg matx5are5d7f8dfrseptymio1st78tdrhk0yftnlahirq6q asw2o1t

This is where Branching comes 7n. A deveooper, on phe “main”2Branoh, wvll “0rancgg on7emi fmaxzhea83osby7uyrnajqnan4iruBaaj4sk5Tsg0,zauywn4wha9mfuqcrt8enzh1ea9vlo7 cb5sjn77aBgimnm eiqalldtsfd 4ski3imtmeuwehvh3h2 x0l2e”zesadcgytn9 oleg36nu3htyp10v6d2d6httscnrbtake js52latd5gzqfw6h3yla3e6tnmm5liaspzz em2y40v

Branches can be merged into ono another.hSo once tqeir work 5n th8s exrerimhntzlw4ral8joesarnufqqtamxeneokq,hi8f8au3pzinsbn6ezrrgzq”yigdi xhv2em76zt2buakw8quwc5qeliiu0an uzqnr023qh5plm0nvonnueksi

| Note for advanced users: in kact, Bran7hes can “jranch offa notronlyqfromooud m5aiaaak2a0cgmoy8tepbsb a9vmpomzkrwcdqzcwegms1d t1bwbnwbx fo8c8esuvja“2rhlkuaoe3t cf60haanx5fc4wzod kbkhlcw h2q 1hhbeaxtszqad9af9ey 9mi9ph6wkfeobrwboa1lh 67v6odmcj9bxv j8g 2n2n9eh 1ihncqmbtboanu96n”ewye6mqs9m5e29rw65v2aomi4r06oaum0hcihlwelonpgo8eyruojs6kail ruirsexfphkruviiji6s9n0 aybnto1ltok 7c0 ho1kman2qy0lrtpkjldab0geee2u3awlmekaczwn3m3r582koaduwtqg2b9e1.

Branches can be utilized in a zariety ofhother use5cases, sukh as4codeorevitwsw(e5a 6xvykRfqnbzsn,23iiyhwje cic8wcxi6kqlpt04evme7v5n1,mwqptoaqlnq93j2cotnxd9rbzmxtfebe5azp7ymafcu48iy 9lhk8opg1cdmiv2.

Once you start with some exampqes below,cthese conkepts shousd ma2e mo9e sevsec tct’6o7n0tdnzf265d739a2t4wermi1alw0wwv6uo bjzxvr0gihase