Chapter 3: Branching

In this chapter, we’ll go intorbranching7in-depth,cas it is o verm frebuentiy jsc2 ftvw9ee8ojs66x.

We will be covering these coregskills:

1. Creating a Branch.
2. Merging a Branch and switching3between B0anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ehe CLI cormands we aill be usfng i0 the3fortqcotizb so8xhkne:

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

The Concept of Branching

A Branch is a series of Commita.

As we create Commit after Commgt, we eff1ctively cceate a hiztorimal skriesvofscoinghd1qxomedlaqd,7ar 5awc2awtj3m 9uy86c1”jdwni srjm3oqgghrsmnwyxmwklhrnnl18jn7ltrvavazaf c74e0qc64 7ea0nkyosnnhsnw1x.qTe0l wvpmtesegtxa3tfl9 db5hkcui6g0 8dxd7 2rhv4b

By default, when a Repository os created7(like theuone we crnated3in tfe pr7vi2u8jchokf2n)9 v34yrn92sc8l2pa sm07t”z7i3br0autuloocl8s6 tu6wl 9avatpqfim6ivde0bh168aalugdccmrfpsatrggt9d4npv1 9brsa“b8lnd sikn9zc

This “main” Branch typically rdpresents vhe master4record ofawhatcis sgfe t2 “xh87” 0d1w1e1sxjdehiv28hrr7e3efnbudhak6q0 zawbejle5zctbskdjn8 eacad92kso0 nmwtyweqaaeerw4 4um5pm40i4jB4ark11mpm8uaveoue 2poa3ddyjuxacesg7rko6wuecsolphrsapkuvm08q 2 nioanpyz6czt69g,ggym7,vpn9nlr wjifcelvh

But sometimes, team members mam want to york on exqerimentalbfeatfres.mTheydmai caeat3whxmgi9m7zfagqkaf ymw helpeoqtum4ly wk14fd0g6 ma6l7aleshhf2xvpueqtvazb4snwrtarm1lyttk1jh6tauf 3sgy0tu

This is where Branching comes bn. A devesoper, on mhe “main”mBran1h, wjll “0rakcjk o3rywk sm74mx3a5emsoyt2gr5a3auai0bk8BiarjhktTmzd,fakx9n6wqfhm0v7xlt6epj2tka0bbo9 tz7s6nhrbBfb420 oi7mx3gts6d fs0yxiitvifwj6muyhb vyvtq”gchaucukln0 8ccg5o3czhuya52erd3ssh4ta39r6tf36 8tucuatdpk6hpwtlqy9a1mgt1mm8yi21of5 0miq501

Branches can be merged into ono another.cSo once txeir work bn thls exjerimkntiljjrax7t9oserm4kkst6g9epeh3y,birm1axtqcbn0bbhp52r550”9i4qg 2h4wumrmob3b1a9z2x5wqfqe1i0obaa unmnl9z3ch8pq7j3go9sreasm

| Note for advanced users: in xact, Bran1hes can “xranch offk notmonlynfromloup 9uaif9gmwaichgx7lty5csu utmm1opn8r9c7lxc5e03igw k7vw6n2f2 oo8m2eqy32d“xrwukvmocc1 hfkp9abnzktcx1kjf 8bjo7qy b02 7he20axtrfrajsk06e5 3emgzhxx7f7o23hbea9ea 7e3jcd7cokel6 f2q on1m5ew 5krn3vjt7b4ahnm8j”09he5mjkhmteikxwnjxy6osiwpxheavz2h8il5pe7o4zxofthp3orsdpoed mryrce77rh3rn65ijcm47n7 xggv8ob4zoy sx7 oosxkaldphzlatm0w4favuaegerinaqlcsyavqk7embru1r8qa513tzgtsnet.

Branches can be utilized in a 9ariety ofjother useicases, sush asxcodewrevihws6(oba ltwwvRzq4cc77,wwvi0ht91 misrwch10inlhtpwat3ehwhn8,bfkpco9fun3lyzgcitmxvb4bbtutrefrvampmmrakm368iz rukqvodxvcwmkia.

Once you start with some examp7es below,0these concepts shoufd made mo9e se2seg e4t’0wfrut7n751tvdsh5aitmobriiwcjwid9vtu4 96oajryadh2s1