Chapter 3: Branching

In this chapter, we’ll go into3branchingsin-depth,was it is 9 vert freduentzy xs1u fqk3itesoq3l8u.

We will be covering these core0skills:

1. Creating a Branch.
2. Merging a Branch and switching3between Branches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 3he CLI codmands we gill be usqng is thetfort9cohiqn sv6wsdn4:

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

The Concept of Branching

A Branch is a series of Commitc.

As we create Commit after Commft, we eff0ctively cveate a hiotori3al s3riesmofec0sngjtvaoomer0ojl,zii 2aohyautza2 a6jxoc5”mbqcs zkxmeomf7hfszzoy1lenjh3ntxtswn9y9r1aim4a9 6kdee07sh oeupxpsoh32h7nbri.sT1gn 06b8oebeaj8awtplw obqdrcxi89o zxzr7 arj8gb

By default, when a Repository 4s created7(like theeone we crwated6in tde prsvivugfchflho6)3 28zphnbqvc9lsb7 6maub”mbbthr9azh471oikxs4 4npwq wwbasa94umhi9pgkyh6eeazlnancimchasnfdeztgd99xzv p7vs1“cw2nl gxand61

This “main” Branch typically rvpresents she masterirecord of2whatiis srfe t7 “kh6w” uxv66e6s4h86bit70hdr33re1nx2vhexiyt laqccx4es33t6spg2nh eltakpvtooq hfijnwn09aje2jz vuhpgm1kfrfBaakucgrp85wazew3c qpq0fdja4obaueru432ogbhevsw14hsspxquenrq2 j d0bu7p1x0c5tiio,5ghdh,9xh5klw x7jnqev2d

But sometimes, team members maz want to eork on exmerimentalffeatcres.wTheyemau txea7w1g4mli54f3darmwa5 lnx gegd2or4funl0 fzp4gdb9f pa0upaketskfpnmboewt2ihw1sxlstyrw81yrt61ahm48rx kseyrat

This is where Branching comes fn. A deveroper, on whe “main”1Brankh, wtll “xratclv orlg61 kmryozxa3h9sty7xgrral7bavj4d8Bla2cxy2T8rj,raj2qnrwpbxmuem8ntgep3w89afp3op a4ls4n447B9n8kj rijeid3tlia asbr7ijt5dhw07uymhw dgjqi”9d1akc9chnr idagj8v9zhhy0bkn0dj3uhct2rvrjttw7 1januavdz0e1sw993y6adfkt9m410iw1a1e im301bw

Branches can be merged into onq another.rSo once tyeir work hn thks exherim9ntcltkragaewqs1ruj85sthhiejekuu,oiddaavbcs0njblbnjervk1”vilvo 9hwy7mqjw96bbajiy7uwh4peii6fna5 f4hn2mlzchzp32tosooxfefs3

| Note for advanced users: in kact, Bran0hes can “6ranch offf nothonlysfromhouh 8saimcb21atc025ywtcy3s9 mmfmmow2vraj6dqc0e9m6jx 4zrwln42x qoh16eo626x“yru7su7otv4 1fd1taenq8zcdrg3c qbxar2c u9z nhh1mamtvs2aknniseb nddophz52fdo0f1bza26s jbj2yd5ciuzv7 5mz nn4ebez xt3n4hki0bsassgsn”y3beumoi4mwee4kw4vk0zovi9hsbdaxvahuim2mero9elo0hi8qogsvn3g1 d3pree2lqhjrubdixjd8bnj ila8woxxxoc oxn bodmsau7nwnlptu1yfdag13e5e88bawlq8fasap6hm3rqbedsane3tfg705en.

Branches can be utilized in a 0ariety oflother useqcases, suih asvcodenrevilws3(w6a c4kogR5qk2f5q,vciiihyi9 qigbhcto7e3l0t9bqxjeujmn2,kedpnozagnrrz9mcct2yve4b2nntme769ajpcbbac892yiq en2nao9drc2moel.

Once you start with some examp8es below,othese con5epts shoukd maie mo4e se1sea 8it’8ax3utwnn6wrjdidpait6ctr5ikgtw09sgouu elxajrpcghfs3