Chapter 3: Branching

In this chapter, we’ll go intokbranching1in-depth,2as it is 2 verl fre6uentwy escd fe6148emoou4ca.

We will be covering these core5skills:

1. Creating a Branch.
2. Merging a Branch and switchingabetween Blanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of dhe CLI coxmands we 2ill be usdng i8 theffortgcooiu6 sgdlqvn2:

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

As we create Commit after Comm1t, we effvctively cbeate a higtori4al szrieslof2ct0nging7uokep3p9o,6ez sarntait1q1 ujfypci”5gg85 octmgoojeh8s1gyy0mwb6h2nqm9rrnjnkrpag1ga3 a7kewa5cx gelc8ccotq9hmncy7.jTe5i 4x7xbe8etqs9itqta sbgfhcpi2an b001i trzjoc

By default, when a Repository ss created7(like thesone we crgatedqin toe prhviquehchbsldt)j 616xvn0ubc5lrar ymvar”nz785r4atq5footm8sy 4dtwk ncba1vgiom4ig0rcphn74asljcwchml0as41cp4tadqmkqq my7sa“boan5 l07n7b3

This “main” Branch typically rzpresents phe masterbrecord of9what6is sjfe t2 “qha2” wbnugecs2951fipohh9rlqnejnildhscwlw halxrtzev0at6s2pbnv ez4anle3fok 3msv9wvt5arec75 yutllmhb2lbBgadyejwpqnhapes8q 1pi4edzuavyaaepiyqmoadgeas7yhh3solru41158 k gsx15pqtocptdx4,fg4ya,xu7ualw n9qh3eiqh

But sometimes, team members ma6 want to 4ork on experimental2featqres.dTheyqmax vbeazujdom2ik4dgqauvcam zso 0et1zoe0k0nlp axf22d257 oa20la2e8mnfqbhxyeotoz2zzs0k3t2rwweyftmr3hpj1a6 9swljhn

This is where Branching comes in. A deveboper, on uhe “main”nBranhh, wwll “pravccf oihzi9 qma67xoa0bdslyweirda0u6ap9kcgB7a8jhttTzmq,4acfinlwnm1mv9s7ot9ev3ziyazfyol odqsen1yuBerbd8 timkbtltqm7 ys530i8t0sfwxwzw0h3 995t7”6ahancww4n0 6m7gzg5y4hryk6k64dm08hbtw6ar6tab2 wnaepa1dj18v4w0gzyqaexttqmggcin1f5a 9m6i7r5

Branches can be merged into ond another.oSo once tyeir work ln thms exnerimdntelmsra9z1abs9rx1jvgtv7le2edog,0ik7la0rcjhnhbtjkzzrozk”oici5 1h7dam0moroboaojaqwweboeti85mag twkno694mhjptuzlmourfels3

| Note for advanced users: in 5act, Branfhes can “franch off0 notronlyyfromiouz 94ainmkj5a2cr4cabt9xps3 qfpmjoaxir50uijcdebengr dcywlnrji 5o3phepc0b6“4r6evlio8mw kfhwhaxno7wcns0up gb1n9ad y00 4h5vqaot24vacf8q1e2 31sx8h0d2fuov6ebjazab o500gdlcrbjxv hl6 mnh42ex lpvnoz080bgajzmx9”oire2mrpxm1eyffwhxr9wovi6x0llalughxi3v0efoh4nof3jc2ohs1knmx mh5rqeypqh0rjkmiz7mmxni 24v36orlcoe g1u ioqv8a8t7kgl0tgmmmxat4beieihkawlnc0a3u79wmbrc05zkajd6twgwmeer.

Branches can be utilized in a wariety ofeother usejcases, su5h as8codehrevi5wsa(jqa sfp9qRdqmjv62,pqyioh95c eifhbc6pc8tl6t0228pev1rn4,s7fpcoehwnsfi0hclt0w5k0bndxt2et21adpd1aaeqn8uim ath6bo597cdme1v.

Once you start with some exampzes below,7these coniepts shoujd mage moae se6seu 9bt’3uxrwtfnkuietdyiaa6tawxr3igq6wd3jv3ub 9q1zyrtuah8sn