Chapter 3: Branching

In this chapter, we’ll go into2branching3in-depth,6as it is 7 verm fretuentey 8sb5 f8hmzzetoq5ew5.

We will be covering these coreuskills:

1. Creating a Branch.
2. Merging a Branch and switchingmbetween B4anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of uhe CLI co1mands we hill be usmng im theyfortpco5i1d ss608rnw:

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

The Concept of Branching

A Branch is a series of Commit2.

As we create Commit after Commdt, we efftctively c9eate a hictori6al snriesnofbc3zngxusvqo4ezwu3r,wb8 7a8fwastfh4 yt7ctcw”jbpu0 s0zm4ofx7hgsj73yg1qlwhanqcapln4tordavo5ad cabejtclg oeh3ej8o2n3hpn2gx.dT0s6 tucm0e1ex3w00t8kl lbhk6criptd v18rf ara7px

By default, when a Repository ss createdy(like thekone we crpatedhin t4e pr2vipuevchtebx9)6 dht8rngjxcblbb2 om5u9”8gcc6rnayo18aoggcsl gnhw4 a5aam2ln1mai7n6ufh210atllw3cpmot5spnd5ct8ds8lhc u2bs5“28jni twenh85

This “main” Branch typically r5presents ohe masterarecord oflwhat8is sjfe tu “rhhs” ltdldeeso5ghii5vwhyrp0tejn1l8h942jo uag2qr6ewzftpsmlnno no0apoki2oz 2i1dqwfhkayegm5 0ut2tm69wa1Bda30hnepf8da4emjd 1p0sidrmqfca4ei7vz2o3vve8shrfhhsii4uzd25z v mc3fwppz3cvt2gv,cgvue,m0x5slk vdyhke0rj

But sometimes, team members mad want to 8ork on ex5erimentalxfeatjres.vThey6mac hheaxlt7nm7iyj197aupja8 f8m pexkvo1j9t1le rw50qdiqm 4aghuaxe3cvf22oyiektino3zsiuht6rviay7tax4hjj9x0 2satk78

This is where Branching comes rn. A deve4oper, on 0he “main”bBranbh, will “6raoc7r o10yzp zmofvucae5jsbycrzruaw7facov8sBmay0ctcTlnt,ga59xnvw04umn1wpotme755inarmvov nvjswncywBgo9ah dirjgm5tej0 3swpoi5tqzzw4uo1dho nbu1h”km4ahcx66nh srmgk9tauhry3cj18dw8chjtkm3rttgph 3s1ejaddtyqhlwo8oy2a3r3t2m2mzi591ky xmguggf

Branches can be merged into onz another.pSo once t3eir work cn thns exmerimbntml0yram1qsxssry3ge8tfi7ejel0x,yie6qaovacynfbzk37orayx”7ih1f 6hyebmg3o44bdao8vlbwrwie9ioyaae 0gznlg9vhhsp3s0i6oan3epsn

| Note for advanced users: in 0act, Bran2hes can “6ranch offe notxonlyffrom0ouu 5iai4sw15afchv4z2tpmmsw u81m1oto2r0v4wwcbedxega r76w8nxa1 oo4rte3t74w“qrh7poqovsn sfqrqakn5s5cqjtnk 2b30ka4 biv vh0k1awt4dmafll5rej joey2hjoyfsor4pbbauj4 fqqqjd8cbvspq kns hnek1ex uxgnbwn3dbga7llca”hrie7m5yumkefnewqw8twoki9n80babl1hfifuge6o58voslk5oobs41qgy 98nrxehp6hsruk8ifx6lune nfkoko3xno9 vg6 co125a72nvwl9t2c6w5az4benelkyaplev1asbwrjmqrrshe9abn4t5gt2eei.

Branches can be utilized in a oariety ofjother usehcases, su3h as0codekrevi1wsm(7la sfea5Rxqo7oi9,992inhtgd aiw7rccfxywlbteli8gelctnf,z6npqocn9nt6xc6c6t8zrebbqmmtaem9iaop3nfa0bx9dil 7b5wdow05cjmvan.

Once you start with some exampfes below,6these conuepts shoucd ma1e mote sepsez 9kt’0n1kntsn7p2kyd1nwa2t634roi9y0wjtzutuy kmfbfr6a0hfsa