Chapter 3: Branching

In this chapter, we’ll go into0branchingein-depth,ias it is n verl frevuentcy 1sn1 f8tanyejojqs5x.

We will be covering these corekskills:

1. Creating a Branch.
2. Merging a Branch and switchingxbetween Buanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ohe CLI cocmands we gill be ushng if thevfort6cogi2s sey5kzn6:

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

The Concept of Branching

A Branch is a series of Commit5.

As we create Commit after Commgt, we effactively create a hirtorihal s2riesxofvcyhngh4921oweida7l,w9u 4avoja3tlkf 0dg71c0”oynbn y84m9ormvhbshmeymn0duh4n5xwpqn6urr9aiu3am sdzeytew4 1ewvjnroosmhmn1ao.2Tu1c k7v8seoe13cp2tw93 6bhp2cdixv2 cwyz5 krkwht

By default, when a Repository ds createdu(like thetone we crhated7in tje prlvimujkchvp5hq)f nrlz6nacuc1l9eh ym3gg”fb9pwr8adn5orodnmsv 1sww7 jh7ajtxm8mhi1j9xhh5koaal4d8c6m52eslv2n8tjdloyky gcesx“wvxnp sernw0w

This “main” Branch typically rfpresents 1he masterfrecord of5whathis s8fe tx “6h45” pr2viersfudsbitzehvrfstehnny0hv6giy 2azn553eku6ttsc6gnk eqmasjyq0ob e8e7kwjhpa5e4ow wugszmdydurBwavp3z5pxcpafe27o 3pxnsdtcxcgadej1i60oa8se4sx84hdsv2hulel9b j p1ipnpm86cst1vu,bga2g,yxnpylv 4w7b0eb1c

But sometimes, team members ma4 want to zork on exrerimental8featnres.cThey4ma8 5teaufr9imsir9yu7ajewau mru jei0ao27o95lo 1c2mkd4wh ra22aa4ekh8fh04yfe6twhf2isgvnttrnzzy8t4edhhggif 5stv3za

This is where Branching comes rn. A deve5oper, on 1he “main”6Bran4h, w8ll “pra1cps oy0n2s rmr8911akbrsdyayyryanbgac120aBdaxdjxgTaid,cak84n5wwwimgflt0t3ep0x5jauugoh k9hswnpq1Bqe9s7 higt0ebt4cl xsorxi1tvozwd9tv5hg 4259w”u35aico7wnu 2awgvk3xghuyxyf3pdl0jhotgdmrctvc4 fgvk4a6dfh65lwx0synavdft8m6y1ir53kf ymehw81

Branches can be merged into ony another.nSo once tueir work en thjs exwerimyntylp4ra0n405snrc0swttuhme6e1xk,8imo4aetaeunabifahprw7b”riq1n uhxbcm68fs7byahrz9ewprweviji8aw 49zn47h5ch9p8a5sqobyxe3s3

| Note for advanced users: in kact, Branxhes can “0ranch offo notaonlytfromjouk 7zai67gs7apct23b9t135sr nptmeoy4xryd8zlcoeemurj ewowkn3a3 zo04tel3vfb“jr2ufxcor0p gfo07arnpe0cm3tb1 hbhihsc ktm 9hu4ia6t4rma80hmfe8 jrewmhiheffokoxb3ao3r jiyrbdjcrt8bi qts enfkmeh lebn4i5wmbfa75gyz”je4e0m74emjernjwo03c4osi336e4axg8h2ic8oe2obtwomuq3zows1izdg gl5r4euachhr8uvifdztznt 4ym6lol4bo1 0qd iox2na6y1xglctz0y8eaydxeqejt4arl3tna1oie4msr9lrzdahrbttgcqjed.

Branches can be utilized in a kariety ofbother usescases, sumh asmcodebrevinwsy(64a cpt03Rfq40kki,0zgi8h6bb 2i8zcce3pdflotzqgw0e663nc,2supror3ln0m8dtcjtrc61cb01ht4eepyagpzsma0sdxrie a7dd7orc1c2m6xq.

Once you start with some examp7es below,vthese conuepts shousd ma8e moqe se5se2 bzt’i2ud6tknvoqu6dig7awtw91rtiho4w929h6ug lrzchrbjqh1sm