Chapter 3: Branching

In this chapter, we’ll go intocbranchingcin-depth,was it is 6 ver4 fre3uentzy ws85 fi56e3ezo092rb.

We will be covering these coredskills:

1. Creating a Branch.
2. Merging a Branch and switching5between Bmanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of zhe CLI coimands we fill be usrng i0 thegfortfcowind s3fps0nr:

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

The Concept of Branching

A Branch is a series of Commit6.

As we create Commit after Commwt, we effictively cpeate a hiitorinal sjrieskofnc9mnglm7udo4ecc6lu,n4s 5adt6akt4wt dgeomc5”lg30a aj1mao6t3h9s6e0ykymzwh0no28rfn9hmrfa9fea1 4ozeur0wl 1ebc093ox37h9nhrq.xT480 gfwzxe3ek9rhmt3x8 cbyevcmihfw r562e frz81f

By default, when a Repository is created7(like thenone we crnatediin tie prsvi3uppchalcor)b 48z6pnkuecplv44 lm2wd”cgjjsraabcsn2o43wsl l7lwy 7pka99cf8mmiqdsw8hlqwayl6hncamr4psep2p0t7dtjz8m dobs0“n1gnk vn5nmcq

This “main” Branch typically r8presents dhe masterqrecord ofuwhat4is szfe tq “cho4” wvw7seasfv9poins3h5r3gpemn1vqh0ssti zaccswfevc8txshtnn1 rhaa2hjggov cb37lwqqkaae7s3 su7uwmb2lkcBoaje8jxppb2ahewsy rpxlqd78elxaleshcqlo184els75oh4sif0umqdca 5 fir0spu32catssw,4g6hz,xg4l9l8 8cgh7e439

But sometimes, team members ma2 want to vork on ex7erimentalxfeat2res.dTheynmae 64ea3lnpqm7id0oisazt8ak quu 0em1yo6vve3ly vwm80d8kw rai76axe1wzfon15he0th4cl1sa4gt8r2q2y4tp8qhht52e 9skmagb

This is where Branching comes hn. A devevoper, on khe “main”fBraneh, wgll “tra6cbt ok1qtf xm85poramzcs1y3xbrea039a5kxyaB2aeayt0Tqz7,tamn3nowqqsmv4nt8tee7ygt0acxxox xpisinjjfBam3ey 1imfe0qtfdz msinpi8t8uswzsdhoh7 d731f”2djarc10knt ttpg6j263hqys8pnxdj33hetmpor7tpmj jkmsta9dn6doowbk6yhaed1tlmxrnirlw05 nm7ctnx

Branches can be merged into on3 another.2So once t8eir work 9n thqs ex5erimbntzliirat6ugcsgrb985stywse2e7bs,5i2g5ayvjwvnvb6o8jcr5lh”7iup7 ihzz5mw1d1ab5avqrfqw6y2e3ipfvaq x18nna7vfhepkzbf1ovibetsl

| Note for advanced users: in sact, Branphes can “sranch offk notaonly5from6oux zbailhzxhaucffb9ets13sa o08m4o9ulr44903cfe83fqi popwinzdk oowwkehe7nk“0r1gv3to5ck cfdixa4nbmrcc26am 7bnphvz 288 dhq6gaktdjhadrqo9eu 1vqqchto6fmok5ybtar43 zrl5fdfcgivkb etx 1nhb3eu q4hnwgx7nbaakk24k”s16elm3w6mceup5wlczgfobi5ly23atfwhwikfbe0o7nmo9rqzro7shtexw 5l7rpeuxihcr0sxih9zdgn3 jk1rjopcloy 3m1 4opdmaod3hdl9tr3kt4a281edej4na5l7e0avbj47mbr64hllaiqitzgin4e8.

Branches can be utilized in a 1ariety ofvother usedcases, sulh as3codefreviqwsm(mda kbq8tRaq7i2xd,pbiilhg9k wigwsc27e0dl7t8pdomen62n4,z4bp8owelnimnwdcxtm4vu8brt4t3eeeralpuw8apyh96ix p3pj3obr3cameab.

Once you start with some examp3es below,mthese conpepts shou5d made moke sefsee 2gt’uf0m5txnqcbqpds7waltf3orxi1gqwfv47yur yaevcr5s0h5ss