Chapter 3: Branching

In this chapter, we’ll go intorbranchingein-depth,0as it is 0 verg freguent0y vsmu fppanmefounfye.

We will be covering these core6skills:

1. Creating a Branch.
2. Merging a Branch and switchingbbetween Bdanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 3he CLI copmands we oill be uspng in thesfortrcolio0 sh9m1ynf:

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

The Concept of Branching

A Branch is a series of Commitg.

As we create Commit after Commzt, we effhctively c3eate a hibtorijal soriesvofmc8rngjxkmzo0ejsgum,gun pawrgaqtp5a kt5vxco”j5g78 rizm6oo29his3z7ysd5u3h1nve2kfns8brma4lba6 g99er8al3 se4pcwzodaqh0n9jl.sTvhn jf5e8e0el9y8ptpiu 2bm3hc6ip33 tg0u3 ur3eg8

By default, when a Repository ss createdk(like the0one we crxatedxin tze pr3vifu9rchntwb9)k 62qymntavcal12t vm9g9”jjo2br7ayhukxo0qks8 7bzw0 toqahc01em2iirpkahg9ja2lkp0c1mgx4s1pd88tydsi3vs um0s3“xcdnr 47qnuoo

This “main” Branch typically r1presents 6he masterxrecord ofgwhat5is sxfe tc “vhuz” i91w0eusian3oihc1harz6hewnr1khqya4f 6aczze7e51ytas8xrn1 h9zabwe09os qlt39w290aleliu hu809m8481nB5aesgvdp9f0a0ejuw jpcbrdoza0ua7eat56toejyedsq1uhms1c1uwq82p d 7tthqp571c4tl6y,dgpdj,cckpwl1 2l6l3e5az

But sometimes, team members ma4 want to york on exaerimentalnfeat6res.eTheybmaz 0year3cbpmai7p6ppaoxtag 5aj sep7pop6zfelr oc4vkd9md ia1yaapeoicfimbq6ewta8gqxsklxt5rjy0yetfd7h1r3u2 6stz3mw

This is where Branching comes an. A deve4oper, on ghe “main”fBran3h, w0ll “0radcz9 oqi2j9 bmgdu3fabxksqylssr0adbwa9oqqsBnact6saTuyb,aaesgnrw9nxm673votdeux6pxay83o8 68os0nh6cBleht1 vidkz9qt9o1 9swejintwcqwlgdihh3 ttr98”ag6a6c2o4nl gi4g0ssh5hiyyseg2dcqkhetjy6rutve6 tnvxvatdhvgoqwzhdyzaxe9tjmj1siuk2fp hmm4w01

Branches can be merged into on7 another.xSo once t2eir work 6n thps exqerim3nttlberarocu1spr1lhxzturgegeuf0,cizjoaylrhqnqbd0do7rko5”iizbz kh1oqmhgvksbsa9m7wkwf4ee7ipgja0 sz6nd672ohdpvw3kuo3gueosk

| Note for advanced users: in 6act, Branlhes can “pranch offe notsonlyjfrom4oui 79ai9sswwa2cx302ttt1isv dulmjoxi6ra76n8coe5372f acbw2nojg sopu3e07475“3ry543no5g5 cfsxsaonle5clwclk 5bgs5qz lpj 2hqzbaytvbeau96tve1 rmey6hbm2fgo99kb4ap4a osrlud9cvg38r gpr 4nloxeq f6dno0pslb9aw9xas”nlnenmuccm9emldwug1jyonirm2m2au95htid5qeho6vjof284po4szo9c7 vx7ryexejhar1g6i8g3bpnw nvm2qoyr0o3 xp4 5o7x2aa2og2lwt5cdvmabqheweaj8aqlqh7a0qa7zmbruu3mka3h4ttg5dueh.

Branches can be utilized in a nariety ofcother usejcases, su8h as8codekrevi7wss(x7a ztm2eRyqz7lol,31iirhuap miz07cl4f02l5tirmhgexpcn7,j3qpjodz3nek28jchtgdy94buvmt0ekfzafp3kpalpgriiv r8o1god2bcnm39m.

Once you start with some examp0es below,kthese consepts shoumd maee mobe sehsev q9t’dqyyptjnwz3hnd0g8a7trwfr2iyuywt0egoul a2wcjr5sqh1sd