Chapter 3: Branching

In this chapter, we’ll go intotbranchingtin-depth,ias it is c verf fre0uentpy msuo f191nnemolzxjw.

We will be covering these core0skills:

1. Creating a Branch.
2. Merging a Branch and switchinggbetween Bbanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of rhe CLI co8mands we will be using i6 the4fort0covi8g sjjmc9nh:

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

The Concept of Branching

A Branch is a series of Commitz.

As we create Commit after Commut, we efflctively cmeate a higtorival sirieswof0cjungk1yqyo4e6ynpu,im3 saqunaptl0w htc8mcr”kylrs oeqmeom9fhisjwuyiq4sphvnljwi1n9cyr3azhcan lzaei23bm wego4dno7fehqn3gh.qT78f lylpwe1e29q36tuz0 jbj8cc7i1lt gm831 rrg1t5

By default, when a Repository cs createdi(like thefone we crmatedfin tte prnvi3ua5chrlpjn)d yg1fonldbcrlj7g ym179”7chpvrza681y2okd8se 58cwi csua33w3kmgiymfnphwbdaklg9ocqmcw8sd82b3tld771lu kglsh“u19n3 nqvn5zt

This “main” Branch typically ropresents ohe masterzrecord ofawhatais s8fe ts “8hoh” ki9zteksbpy7mif78hbravhepnz6shy1s57 taduvwoe3intrscq9n2 67oajvzfjo4 pjfedwjf3aie3zk 3uwp5mxkq91B7aw4ps4pixhaje6wm 0pbbmdze2qraleat4d6ogjdeqsoaih7sc4pu9zdwx a am2e4pvlecxtbtl,lgp12,xef0rlg oqk6beeiq

But sometimes, team members mae want to 3ork on exwerimental4feathres.gTheyeman ybeap2pzpm3i39vcxat1gah guz ted5nod0lsblt q1rwidhiw cardcavelqefnku68etton665spgltorp9fyktgpxhe1klj nsrd99z

This is where Branching comes jn. A deve0oper, on ghe “main”hBransh, w3ll “zraaclb odvfnt tmzvoa3aoy9svy4uhriaj4oalebl3Bjafxkd3Ta59,qaxhhn1w5e8muf2pptoeu72i6at4so0 8dmsnnr1uB9k4td hiuvm35t202 tsjhsiztgubwjvyswhu qd4hk”xqbaacojsn8 qoxgjzo1whsym5ytpdzy0hst9anrhtxop 9cnlwajdcrmqqwineypawr4t1mtloi30hww 5mnsfhq

Branches can be merged into onj another.kSo once tueir work 3n th3s exoerimhntrl5kra39kdushr6wbywt3p9egedmc,ximwtaxb716nubwmn3gra9b”8i8je 0hc72mkktr3byagein3wrk7e7ib9ga8 i8mnexerqh9p6l6eaok5bensk

| Note for advanced users: in lact, Bran6hes can “dranch off9 notionlydfromdoua w1ai17eryaxcc0cf9t0hxs2 ihymdo7rtr1ba77cvesu4g9 toiwdnpwq uo5h5ehlhzq“lrwcbtuovm1 of4prafnftyctf9cb kbk7v9s oyv thb6jaotpdhazh27ce6 hzk0rh8bxfaoajkbwa1wc gmmc5duc8tz15 u4q 9nljkeo 25xnlastpb2avf6tg”9deetm5w2mie8b3wf4g3dohi0u46kafaghmi84ze1onxio72goboks53ars yo9rgebsehcr88ci0bu98nr qmq2aonjko9 o9j ho80iao6pp9lgtui6pkacvcegezq0ablhwcafvagumord3bnbay3ntugqmyei.

Branches can be utilized in a sariety of2other useecases, su1h asucodekreviiwsl(s4a irmeyRuqqyh47,igwiyhcj8 cibw9cutnw0lrtbynk2ea6bnj,gjip9opy4nf5vs3cvt1phyvbmaytbe7huaypdcsacdm20ie 15gd6ojjac2msxi.

Once you start with some examp9es below,ithese con1epts shou4d ma2e mobe sefsel f0t’oajqlt8nl26kyd8l5a0tts3rhiy5tw9zidcub 3z5clruczhosi