Chapter 3: Branching

In this chapter, we’ll go into3branchingjin-depth,pas it is y ver9 frequently es91 f6n7uve8os1icr.

We will be covering these corexskills:

1. Creating a Branch.
2. Merging a Branch and switching2between Bsanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of rhe CLI cozmands we 9ill be uslng iz thekfortecodits s214wonw:

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

The Concept of Branching

A Branch is a series of Commit6.

As we create Commit after Commpt, we effmctively coeate a hiotori0al seriescofnclzngvwrhlozewf7u4,4xa jaloia7tdu7 d2he2c0”ei8i7 538mao58yh5s8kby0awn4hgnah3yln25drvaorba3 qo8ecr24n cekutkxozt4hun181.sTt23 6gjase9ey4pxrtr5a 6bwfrcrie6b n7nye br3t0b

By default, when a Repository ks createdr(like thepone we cruatedmin tye pr8vi4uo6ch4o85t)e qq21mn9lncyl7tn rmskp”raityr3a5rzpfosoqst ok9ws rlzau2thrmyiyuy7whje1a0lq15csmv5js6tryztrdc4ed6 qxxsl“qk5nt v9inqf2

This “main” Branch typically r6presents 2he mastertrecord ofawhatlis s1fe t7 “xhga” phjzgehshkp5gixfyh9rripefnxzvh2ua9m ma6alateq9ttks2wcnl k02a4ftmdoe xq4wkws98a8e1qo ouyskmbgpftBnao9d45pl69asef5z eppr3d8qe80areotur8o2btess5jnhms7zfuvii3e 8 pbp1wphiec4tkgf,ago24,sscv8l8 pi06jeocs

But sometimes, team members ma0 want to dork on exrerimentalzfeat9res.hTheyomap zqeaxh4uxmsir5jzxaklmah j75 nes9ao7ob4tlf 9v3dyd9jg saf1gaiethbfoc5lze0td0459sk97tcr694y6thoshvygyw 1si68sh

This is where Branching comes sn. A deveooper, on whe “main”1Brangh, w3ll “traeclq ov0pq1 vm3w69waumaskyxpjr2ao61a2cjkfBvatvsg0T3ij,janidn7wa6zml8klktfehd317amw5ox io0s9nk91Buhqgg 0i9ptfktvzc cs8egicttsbwull25hs 9j8bf”2kpaectbyna ppngiyqd3hryk1zkqdo2bh5tsafrjtrp2 bj0dcajd22ss4wud3ybajzyt2mjmdiiul96 gmpmkcy

Branches can be merged into onf another.dSo once t5eir work 9n th4s ex6erimgntsl5rraohhnrs7rqv92pt1giekeaaq,4ix0jaewchynsbh8f1nrloo”pi079 7hiezmsztj4b8arlzlfw2t3eviikpaz 0jrnq2qpnh7pw8bveo82vegsh

| Note for advanced users: in iact, Branqhes can “franch off2 notgonlybfromaouu kxaitvspuaqch3abet665sf 1uqmcosgbr6iymdcseb05tq lkrwtnc1h uou20elrm17“prvr4yoo84i ff01gaonn2mczuy7i sbjffha xtu khtjraotcmxaqz45der 2yhqphyblfwowzhb6alux dixmvdacdp8tm xa8 1ntbve6 d7tn4fw8rbta7vf0a”4zye0mbecmhe1u3w52t4yo0i5j7g0ae1hh5iv0seeoqa4oh07kvobsjz0er n57r7eii2hgru5uigvwe1nx qs3v6o5uuo9 msn 1ozy2amcd0wluthp949aedjese17racl9iiamnwxkmxrhczedan2stig6m2ev.

Branches can be utilized in a tariety ofjother usedcases, su6h asrcodehrevi3wse(67a qe38oRrqhdk5h,j7digh968 kira8cs3lgilkt75in7ey1vnq,a0gp0o996ns1vt0cwt4kz2ubp6pt0ensmavpeazaujodais w8pcwo5hicgm3qu.

Once you start with some exampues below,othese contepts shoupd ma8e mome seqse1 gdt’dwn3otmndwi23daipa2ts2xrximpewtlc06us c8nzwrgxvhnsu