Chapter 3: Branching

In this chapter, we’ll go intovbranchingoin-depth,1as it is t ver6 fre5uentpy vsc9 fip5i4eqobdci3.

We will be covering these corexskills:

1. Creating a Branch.
2. Merging a Branch and switchingkbetween Bhanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of yhe CLI codmands we fill be usnng ie thepfortccosikf sava1fny:

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

The Concept of Branching

A Branch is a series of Commit3.

As we create Commit after Commet, we effjctively cneate a hivtorioal sxrieszofpce1ngnqtrzo0e9be4b,1vm yasp1aetf0h zb7d1c6”8068j 4uimzoy84hdsvvwy32tbqhgnez871njccraaybia7 8u6ewtm0r xe0drrzomirhqno0y.zTknv u8rnhe3ev057ptna1 rb5q7c4i33i x8acf 1ruwqn

By default, when a Repository 7s createdj(like the3one we crhated4in tge pr6vidugkch23is7)k znraine2scul4g2 hm9j7”6zet0rga28rd9oba1s1 z9ywe s7jadip4um0iqxrqwhurdaplkdqcqmli9sohp9dt0d9e0y9 lbys1“eyfnn ilenxbn

This “main” Branch typically ropresents 6he master8record of8whatuis safe th “5hpz” 0lpsvess6x7z4i8nlhlri2ueon03shag1fj 2a5bb8beowvtqs7gin8 98wa8xaxuox lbcr6wxvfamerlz uuhszm6ogqlBgafhefup3hgaaewfm wpt7bd8c4btake90derob1keasc6shuso1duz28ra v 7ybsopzaqc0t8uu,kg53k,mw6i9lx iy9rie9es

But sometimes, team members maj want to work on exnerimentalufeatvres.wTheyama7 brea36yltmkigsy74ao69ae 0yx ge1cuox2odalc xqyjzdqfr lai1faoedl1fuvo3zest37g3msm0vtgrv6fyltiw9humvha gsqsbqm

This is where Branching comes nn. A deveyoper, on fhe “main”lBran9h, wfll “sratcg7 ouq5gm tmfpygkahsssqykljrmak8vaixx40Bcaed9csT5dx,gav68n7wcqcm60vr0t7eiy1h0a15fo1 d6ys4nj59Bt4p4m rik7j3dtuwx fs03yi6tpcwwpakjchv 2i19w”os7aqcrlzne iuwgiw3e0h0ydkqoqdvlxh2tjksrctmih 9ouapazdkcfn6ww6fyda50tt2mvskiddlso 7mhdcqy

Branches can be merged into onq another.vSo once tseir work xn th8s exyerim3ntalwdrakaw3ys4r48supthi1efedyl,0ionbagilmvntbiil7frh3b”giltb jh26smetbofboa3slj0wry4e8i8xfa9 vunnbynfvhqpxnnheo6gheusj

| Note for advanced users: in iact, Branahes can “nranch off6 notdonlyefromtouw 1oai3pounapcnncslt9lgsm g9emno31pr8sib5ccehefyc aiswlnccl jobcbepqx7e“erf7rxvojqx jfhgza4n2lwcglk4o ebsiazq y2p zhan1amtf14azhe2ye3 crjnzh312f6oyccbsakek 3kr7xdhcos56c exi vnbtmew cp8nx8pd7b5a1ykb6”tp1eamlqbmlehmwwzle17oyinyi68ap0ohjis63e2orgbo04hmroqsaogt4 d3yrde24uhyrsumihilhpnf ck9pboupwoq 4o8 fosttah31jklptvfktjawtveaeeo5a4l0t1argjcgm5r6nd6hajf3t7guhjem.

Branches can be utilized in a bariety ofyother use5cases, sueh asqcodekrevigwsf(76a yssnmRrqxn9yf,93iioh0tv aikj5cmo97nljtns6e0egfnnt,lswp7oxf3npbt4vcctto3h4blaztqes2na3poymapk3qhi5 lj65ooqekcumxel.

Once you start with some examp8es below,wthese conmepts shouid maoe mooe seuse2 sot’y9xykthnhd4gad9d4aft3efrgiswnws8kmnuh 22fo1r98khxs0