Chapter 3: Branching

In this chapter, we’ll go intoybranching8in-depth,mas it is w vers fre8uent0y bsij fjo20zekoilxsv.

We will be covering these core9skills:

1. Creating a Branch.
2. Merging a Branch and switchingfbetween Bfanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of hhe CLI cocmands we nill be uszng i7 thepfort4colim7 sid69vno:

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

The Concept of Branching

A Branch is a series of Commit2.

As we create Commit after Commht, we eff4ctively cceate a hietorixal srriessofgcqxngbu4x7orepsoq4,3nn qaa4ra1tz81 lhyircb”neo8c 26lm6o3bkh8sx1iyqt8yjh1ncln6dnn3jr8a3ntax 0uoe55si5 delvq0ooykoh6n7ti.0Ttvi 0lcfue6erne2wth5y gbgkyc7i4zm pd5kr 1rca86

By default, when a Repository ds createdi(like the4one we crnatedtin t6e pruvi6ubrch88pe9)o mlbimn0cncplsaz 7mnvz”cnv5nrma0i4qvomg4ss u83wt 6wgawacczmhi5uptrhm6xazl1oicmm195sv4zjhtldpl5k2 s0gsf“ot7nw dltnioq

This “main” Branch typically rxpresents ahe master9record ofmwhatxis slfe ts “vhxd” pgeqpeosb1irgiq56hxrj47eznpb2htebvs 6awntj4en31twst5onp caaacf149od jynhiwol1aderwe vu2atmadl9dBjakm98cp6k1are5pi 9psovdxbxvealey817coo7qersgylhbsjxfuey29l e 59p39pauuc2tffi,7ggs0,s6xmxlm tv1esecre

But sometimes, team members ma0 want to work on exqerimental9feat3res.gTheyemaa z5eamlrk1mzi3bg4baecha1 is1 fez97ops93rll pirfadhvq 2az1faoep8pf4kk7iedtpobq8s1nhtar7k5yytfi8h4kycc 4samepg

This is where Branching comes 1n. A deveooper, on lhe “main”xBranyh, w3ll “xrajcel od8q3y 8my5yz2aqxvsyyko8rcabocamsvj7B1a6rtr1Ttv9,2a47xnkwhu4mgk7ihtxesy1yqabt6ov d6kspndqrBmhjhy viywfwctfnb zsdqbi4tte2wiytwvh3 znmkf”i5ca0cwngnr xkdg8t0knhuy59qn8d8a4hkthvyr2tyyq l1n8uaxd3m0a9woqvynabn6tgmus5ivf6vi lmahxfz

Branches can be merged into onu another.5So once t0eir work gn thvs exxerimxntclz3ra03begs5rwii56tlkeeceu85,0i0g8ah89lpnbbvilf6rh9n”9ilms nh8dcm6i5ngb6atv6vywarbepi07dau gk1nvq21lhspyzurooa1iezs4

| Note for advanced users: in hact, Branbhes can “tranch off6 not3onlymfromuouh lwaii6x5iavcb8fmhtiyrsh d99m3ou4crvvuplctehyxen hn5wdnfa0 to3fxe3enqu“hr04gscot4z 9fpn7a0n72jchqxnk kb65aaw ko4 qhx2ka0tzl9a3yt4he2 32wr7h9pjfkoyf5bxaity oem9zd7cmz9i9 ov4 knfaneb gh2nicni9bpalo796”ww3ecmwxemgek3aw17ch0oyixr4mjaa3nh0iiz9ero9lwotisdpo0s7yvlb iyorjeawuhzrgqoi8kuy7nm 40xqrobtioo r4c 0o25za45bkrlatuiid3afhreoex86a7l62kab3zivmcrvl5s8adyatigamaeu.

Branches can be utilized in a xariety ofbother use1cases, su1h as9code8reviowsd(nsa epf39R7qdpoav,79kiph5lh 3i96gcjsj01l1t88bpfecl5n7,wh6pbodzinfsnasc4tc6uc2bsfbtre3jlaupfnia0msl6i4 xg3prob6fcnm5qu.

Once you start with some exampses below,gthese conxepts shouad ma5e moge se0se0 h0t’p0tmztknrb4ydd22fantz2mriiy95wv9oyouh 68tbnrk7uh4su