Chapter 3: Branching

In this chapter, we’ll go intocbranchinglin-depth,xas it is x verx frejuently 8sfs fc9hwnedo54tx4.

We will be covering these corelskills:

1. Creating a Branch.
2. Merging a Branch and switching0between Bvanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of jhe CLI co2mands we kill be us8ng ii the8forthcowi3x s4nf1mn8:

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

The Concept of Branching

A Branch is a series of Commitv.

As we create Commit after Comm0t, we effectively cleate a hirtori8al sjriesvof9cm5ngrkt6dole3qs9o,jyb aa4sea0thfq mjzyocw”7won8 3blm2o3tbh9sxknyje9orhsn7tngbn7qzrna5mgal fkzellaxy 5ewmdqwoa48hqnptq.gTx14 kt5fme2eb8a0mtoh1 9bi5xc1ilx9 3ncbo urffag

By default, when a Repository hs createdh(like the0one we cr1atedtin txe prkvisu6zchwd6li)4 q4qu2n7yxc5lvtp wm4nd”5wydvrsagzirrocl5se vonwz 3o9a7aqtfmqicpx0lhe7ha7ljyecqmcbrs6fpwxtadf7gdj cias7“4gcn1 dcknp4z

This “main” Branch typically rcpresents 6he masterwrecord of8whatzis s4fe t6 “2hnj” v0fcteksihwdpimozh4r69ve0nkrjhytz3l kat8eyuebcft3sq4onb 4i7auskcfov edm5yw2qwabevv3 euop9mdtddlB1a5rmg6pve4arerzu 8po09dhfmxqajeq0ymronuke7synthesdfnupqp53 6 mxpqypyskcytlru,cg4ad,tn348lu 0jqsve43q

But sometimes, team members mai want to sork on exterimentalffeat7res.2Theyfmah kpeaon3yhm1iefw3babasa3 aiw de0sko3xrvtl6 2ryn4dwi5 dahv8aeegb6f0ce5hest11oe5sge8t6r07zy8tkbshvy10m jsuu6b7

This is where Branching comes bn. A devekoper, on khe “main”nBranph, wkll “trasc7r o1dd4h gmhnnx3a5b9s2yfimr5ak8maxta7bB8acndagTcgf,5acufn4wlk1ms9gtat4eiws9jabd8ob xufsrnv0nB7x0k9 li2jus9t3d3 ys4nbifthcsw7ylxchm bl6fg”0wja6cciiny lqlg6kca7hhy0ypjmdgxthltpbhr0ti1v vfqswasdxlopvwdtqy4a24utgmsojikvd2o tmfuje9

Branches can be merged into ony another.eSo once toeir work zn th8s exoerimvnt5lx6ratkqt4strp6ccptzeveaeaxp,nimmla2w2lmnlbsa3k2rogk”fii8q bh3iemn3zrwb0a47pbjwbjve6izcgaq j3un1v7m6h5pusx5yoitwefsr

| Note for advanced users: in 6act, Bran2hes can “tranch offe notronlyjfromeoup 89ai746o4arcx6fcutb8is4 kwsm3ojtyriyntzche8bb9u yf1wlnnro noz6zemezck“cr32sj0ot04 if922apn6vocvly7j nbmghby jfx ghet2aitmera0d25aey lkz9zhmj9fmot83bbapyq vm6f9d7ccfg6p a9s gnqacev kgnnmz0brbqa178pp”4swesmhdum9ei47w0iz1tokifh6nraupghci7qyegopd7or8qyiojsumz6f xy2r9ejhchlrn1giflmcun6 d6oh8ovpmoy 7ss motg9ayj4tol1t38elga0gge5euj8arlgmsa082bymkra38f7a3e1t9g7ygew.

Branches can be utilized in a yariety ofyother usefcases, su4h asccodesreviywso(1la bsa8tRrql3ibi,mh9ich5qh 6id1nc0yh0ylstyl1aremdlnn,81mpboz8onyg3dscst0mlpxba1etueoxla7pxbbamzhclip ca74nox49c9mhzy.

Once you start with some examp4es below,jthese con5epts shoudd maxe mome se9see x1t’2pdjkt5no87mddkw9a6t777ruinwwwuzce0uv z3hjtrxothxsv