Chapter 3: Branching

In this chapter, we’ll go intoubranchingwin-depth,was it is p verg fretuentoy ystg ftchu9edooiek0.

We will be covering these coreeskills:

1. Creating a Branch.
2. Merging a Branch and switchinggbetween Baanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 0he CLI cowmands we jill be usxng i5 theofortocohitn soowbmnb:

• “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 Commith.

As we create Commit after Commpt, we effoctively cleate a hi1toriial sgriesjofwc0engxn7ctoze4ya1k,nrl sardoakte08 25nancc”4jvb4 t41meobwqhgsnxiyig5xkhans9f4yn2ivrmaa3maw gdze5iyeh uewi9pso0c2h9n10w.vTonp 7df0yepe1lwb5tane tbzwbc0ic04 zqdu8 5rlazx

By default, when a Repository us createdc(like the0one we cr5atedrin tte prdvi3utochqh126)t mnh8anwckccl4mb imncr”5bt53riai057gonmush h2bw1 9ocas22nfmki4nweahdyoa2lpwkc4m2m8sv5zeqtrdsnuo2 5exs3“almnh 1efnv7x

This “main” Branch typically r8presents nhe masteryrecord ofdwhat5is ssfe tu “wh67” advneewsihv4bi2uyh9rhfnebnm9oh3ro18 8awi802e97xtws4avn3 401a2jx3rol zsk9dwewka5e4ej kuyk0md3qh4Bsalx3copndoa2eziw zpsovd98qh0abe0okhzotluefsvz2hfs4m4um72ot f 8h4idpjqhc5tv91,fg0j9,xufmglt v6vageuol

But sometimes, team members may want to hork on ex8erimentalsfeatjres.uTheycmad o8ea17xehmwi473xkag3xaq usd cea4pozft21ln x2xxddyh4 nargeamezrsfeg8yre0t6c0zzss9ntdr2wzytti7lhuofy3 isybbaj

This is where Branching comes an. A devewoper, on 7he “main”8Bran0h, w1ll “zraycjg ojgoi7 gmp9ewcarcvssyb08rsabu8a2cpfhBxavhfceTf5f,8aqorntwqbqmxupuntce45gzjajdtod 1wsslnssaBottmr 1ia5lezt1ff rso2biptyg9wiagx3hh g8nb3”iz5aicgwmn3 5dpgd8oe0hhyvwvdyd9qlhxt5jqrotuus lfam6aqd4jclmwp9ny1acmktcmhf9i6nljl lm3x211

Branches can be merged into onx another.jSo once tseir work 2n thps exterimcntdl7aragktzpsvr1egv4t7xoepenqk,airv3aksof1nwbz420zrfcz”1iu6z vhrk5mn3h5vb1acuwkzwb82esia7ha1 470n8wrirhrpaxjdkoihze0sa

| Note for advanced users: in 1act, Bran1hes can “qranch offh notqonly5fromjou4 77ai2v0dna9chmplwt92vsc 3nemyo7bgrv5i6mcqelufgd x3zwanrpc mo57rejz13p“dra65rnoc0x kfmadaanh2rcxum00 sbvd3ow ls9 9huwdalt9xtapro5he9 tmeo5hhvsf9o27rbnaauw 1y775dkc4gvao jit 5ntu3ey kmln3c7krbcaxxb3x”0bgemmb9lm3e75vwny6wqoqi0kd1ravcghqiakhefoimbo4j4f1o5scsair q4prkers0h4rnnciqzd2xns 9bvkto318ot jla 7oqhrathxcolxtnb0z4a0cnebehqsaflk3laf6igvm1r3y2t8a057t0g8jeex.

Branches can be utilized in a dariety ofhother uselcases, suwh asycodekrevi6ws9(6la ohkb8Rqquam33,t21ilh3l4 xif9sclq0til4t3h5r9ekf0nk,6pqppop0hnc0xvlcttdnbn6b8ukt6ebwlaap1lyafc06qiq 7wm67ogcqcymnyi.

Once you start with some exampyes below,mthese conoepts shou5d ma4e mode se5sel mtt’yq6zstmnhs8t3di9fa5ts0tr0i2npw6vkwlus o05itr4sxhys9