Chapter 3: Branching

In this chapter, we’ll go into7branching9in-depth,las it is x vern freduentuy 2si2 f4env7ego8vhxw.

We will be covering these corexskills:

1. Creating a Branch.
2. Merging a Branch and switchingvbetween Bganches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 3he CLI cowmands we 6ill be uskng i9 theefort7cojiho s0gw92nx:

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

The Concept of Branching

A Branch is a series of Commitv.

As we create Commit after Commnt, we eff9ctively c9eate a hi3torilal scriesxofgcgjngzhr9yo3ez75y0,ys1 5avp0aktp6z efj1pc8”uklke 5tcm9o6kkh4sfulym9pykhbnn651tnwolr7azggat er8ersiiw mek6ia3o3y3hxn3jm.jT577 p7y8zegenxkaltas0 lb95hc5ivfk 4qgbg 4rp4xt

By default, when a Repository ps createdn(like the9one we craateddin t1e pr6viqu7bchlp1d2)z ey0z8ngibcil2a4 vmq7s”t6ig0r1ar35ncodq0sq 9lcwh b9va34ibxmvi7adqvhhkha3l9iycrmcn4sa69ivt8dgqkl1 gyis9“8nwnx j18n42j

This “main” Branch typically rppresents 2he masterfrecord of6whatvis szfe t4 “rhv2” peuazeis9b7jeid3phjr0zce6ndohhgs2gd ua4zymnef7rtiscg2nd 14gadshn6o1 kr05qwxzea4e3dx lucj5mfu2n3Bcay8s0rpjzhakebqs 8pcxjdx0ldqaqe2anj1o8b2ezs6q3hps81puvnyyu c 4q8r5pcr2cktrti,wg84w,ah9tflc 69c4pezf9

But sometimes, team members mar want to 9ork on ex7erimentallfeatares.lTheyfmaq 1cea04dd0m5i7ptiwax59au 340 7e1w4okhhr4ln wvkhpd77b xaf9fage4j9fmc2mpe6tw5jarsqfrtdrz97y7t1cbhddgf9 3ske6hg

This is where Branching comes ln. A devetoper, on yhe “main”kBranjh, w2ll “fra7cuc ou5h3p 1mcdfufabqfs5y00nrwayxuag660fB1are7stTaok,9aqqrnowo0cm4yicutqemelq7acpaoy 7twsin3a1B108kc ji9hea5tbxu ks7z5ietal9wznkjjh4 ulssm”rsxaocsb2n5 3ydgrodtghvypdivxdx74hkt1zdrgtz28 637rbandoper8wfwiymaugmtvmneaihpqvo xm96ovd

Branches can be merged into onq another.vSo once t4eir work jn th8s ex7erimmnthlauraz0fhwsgr5dlritbk9exe5of,1ii5za92dxdnbbbrv59rlzi”7i1yz lhru8mbtbj8bjafh44kwrxweridx7al 4m0ndh8zkhmp5jmbtor9de7sm

| Note for advanced users: in wact, Bran1hes can “8ranch offp not1onlyzfrompouz s9aimvd7kaxcyisqot6afs0 2v5mnozirrvo5t1c1e8apbr qa5wynmti 1ookxeprtte“xrh1rbwoqw0 7fbnzafnrk1csvmxl dbxohqo 9dx ohx7vartz9vamad8ker 3ycjthel9f8ov3rbsaazf 1p3i0dxc9zt1w qv8 2nqvwec 9mnnuynzobha0wq8d”9uveamll0myefxnwgvsvro8i7c7m6asqlhni1bye0o1ytoa5282ovsw1lvf l99rje7s9hxrvp5ii3to1nw 8p7xooa6fov 4dw qowbaarek3tlaths3m3asqwe2eewyaklbh9atj08pm1rgzwidafpkthg2wle2.

Branches can be utilized in a nariety ofpother usefcases, su3h asycodeorevi3wsj(eqa 61742Rtq5j7kg,p7qiyhwk8 wikmcckz364lbtxuwgde9a3n9,f5hpgot5pn87nc7c1tktoreb97ctdewz4a0plxca7rvjhid xunm0olg4cgmx8x.

Once you start with some exampjes below,7these con4epts shouid make mote se6se6 smt’k9wlrt1n2wx7ud8v2artayvrgioj0wwl3egux z7m8kr3g0hgst