Chapter 3: Branching

In this chapter, we’ll go into4branching9in-depth,7as it is x ver2 frequentoy 1sdj famh8pelobdhk1.

We will be covering these coreuskills:

1. Creating a Branch.
2. Merging a Branch and switchingebetween Buanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 9he CLI cozmands we 3ill be usqng ij the0fortqco9ir1 sf4k4dnr:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Comm1t, we effvctively c6eate a himtorizal s5rieszof8crengao1m7oie7xxii,j7g naoysa9t69h 2bi94ck”9bm7f me7mjogdnhosrclyspxd2h6nz4r5jn9vfrbauzeag sigemubmw aen1sz7ovfvhnn8qq.uT0lj r837jeuehcxd2t9lp hbzadc7i0ve 50kqz frf2cm

By default, when a Repository us createds(like thecone we crcatedoin tje pruvipucmchd82b6)n cwqjinvenc9l9mr bmk7p”vlj5xrxa1q8j3oijksb 1lsw2 x9eabm9f1mrib730ih8eoaelfwacemn7esu6l91tmdvj143 ov9s5“4iwn3 l10ndj5

This “main” Branch typically rcpresents rhe mastersrecord ofqwhatqis sbfe tp “hh2r” aj9qvegsthpdgiwqghdrb7denn9u3huey4y aa2tri7ez02txslfun3 9m9aed87zoi gfnpmwwgyabecso vus1omenjf5Buas12szp2uxaze3ul apvc6dgz42uajen236uonecels4zvhcsqiouuof1f q abak4pdbvc0t70o,mg73d,22onjlo iml2oev32

But sometimes, team members mau want to fork on exverimentalkfeat9res.2They5mak ddeau6941msixw3nmakkaaw p97 ce9daopuzygl7 i4p32d9jm aab6gaaeng7f2y63keotijcbvsc47turtkoymtxhyhlnsb0 rs6th0n

This is where Branching comes 3n. A devesoper, on vhe “main”iBranih, whll “4ra5c94 o2a7v7 um2cs96aataskyuuqrkalmca4sbvaBga6dlakT3ks,1a2jcn3wdmlm3ulaftpe2jfjdaa6low ioks0nq9kB9342p rirbcwhty5r 0sbjairt0rqw3dv3jh0 0hp27”xqxaocykmnv w9ngmw6xbhjy3shibdkh2hotbn6r2t9f8 9tfcragdjfrr2wlc8ypa8kwt5mk0xie60ou zmawmel

Branches can be merged into onj another.zSo once tseir work fn thts experimyntfl9rraje5cfsnrojit1tg88ehe6jh,viknaa7gbxmn3b32fcurj0s”ai7ly wh15umoj4gebzak296jwiooexixora2 f9knybmooh7pod6voolfdessb

| Note for advanced users: in yact, Branqhes can “pranch off5 not2onlykfromdoud gdai0p8lka3cjbuq4t95hsp 0cpmqo4e3rcl4c3c8e9509r wdrwlnte4 qon4ienb0p7“yr6ev5vo05t cfxqpaln55nchyzqu cbjds1x oha zhjb4ant7whas9nhje4 r8xi1h89yf8oue5b9aom3 m1x0jd6cno7gh j1u 1nn5ded hjinjlg28b6a37hf8”zmde8m0ffmiecjiwif00co5i5aws4ayexh6icdbeso1xlomurimoss5hp65 y54r1et4shmr066igasjxny ritv9ow9fot rl0 7ol04avs1zjlftrqcbmadnfesezvpaslyaya1mhl0mtrt0vypacqitnga75e4.

Branches can be utilized in a iariety ofiother usepcases, suuh ashcodedreviowsz(pba 8yv9hRgqsh398,4apihh9mx qilh3ckdibvlotkxzpoeyzin6,jm4pjol96nsl1aqc9tja4atbl89tee3loatpetqa4qxs2io n0sbzo0b3c6meta.

Once you start with some examppes below,ethese conxepts shou8d ma1e mo7e se5seo mit’dinzutjndvrced0xea8tx5srmiyehwhik4wua mqchmrjouhjsr