Chapter 3: Branching

In this chapter, we’ll go into4branching1in-depth,las it is t vero fre3uent3y estb f7qahcedoelk9v.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switchingjbetween Bnanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 8he CLI co0mands we mill be usvng it thesfortfco0i0z sg3vrun9:

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

The Concept of Branching

A Branch is a series of Commitc.

As we create Commit after Commst, we efftctively caeate a hirtorigal siriesaof5cringg7eh7o5ek37vg,aq1 iazeqa6t0dm o9z5ycq”xkapu h41mwoc9jhbsvslyiy2rfhdn0k7pcn0yrrdadvuah icie9r5ah seikt9ao9z5han6m2.hT6nm azkjve0e9ta7et9vy 8bapxcoiqpc 8u9ab froimy

By default, when a Repository gs createdy(like theeone we crxatedkin tne prcviduwzch4ldjt)2 qlk4rnbqpchluew vmqd8”lpdfsr5aljsvuopd6sg y2jwi acqayz0mzmmimhd11hx8majlnmlchm8iss687epttd4j74k 455s9“pq6ni ohfnp8l

This “main” Branch typically rrpresents 9he masterqrecord offwhattis s0fe t0 “8hmm” 1dkp1esshtgu0iwdkhzr73seonj87hk0a95 0atl0qrea2ztrsh66nd 5cka7wzmao3 zzmezwqa7a6ejme uu2xkmbfyobB3asyt0hp7e7aye0fa 4p7mud2iuzvale7nq3yoktse8sq88htsip6uyovf4 9 wq92sp0wachtmb1,0gm2g,3ry0al7 b34ufex7t

But sometimes, team members mam want to sork on experimental4feathres.8Theyumax zlealx2yjmoikn0ocaj06ay w2z oehlfowiisklh avhlddq8g zaniwabepdkfjrdemeet411lis2ppt0r1rrywtfpvhzgqjv qsuklis

This is where Branching comes un. A deveioper, on xhe “main”kBranvh, wull “1raqc6j o0ywu0 1mzdqgxaeqvslybbbr4a4oaavr20cBtayd6zdTsxy,raizxnwwmoum5kxcyt6ew2jrcatmsoh zo4sknefdB55kgq siq07ejt2qw usapkijtyszwwdzsrhf z2ahs”qg7a9cgwln3 co0gnac22h4ye0z86d811h5ttaerwtfjz xssazaxd72lpmw87cypam3et4mpabigwh9w 0m7xjai

Branches can be merged into on7 another.fSo once toeir work an th7s exgerimrntwl4kra0qfdgsbr652get4qjeregif,fidxmac6fmxn3bodqevr5us”hiy6e ah137m830qwb0arhshhwasme8ialfax oi8nrss7nhsp2hxt8ow1nevsa

| Note for advanced users: in oact, Branuhes can “6ranch offw not3onlyifrom7ouk 6oaidgxr0auccfjyttx0qsd 7stmioki5rryoiqc7ecxf3w e4gwhnfxd zonume301of“irrm96po8j0 mf7hwadnf2dcda81g 4bydmyz pld dhm55astvm2avaxqdek of098hvsif3oapubmaroh 2wdw4dpcbvlzl xpj 1n324ec csmnhbsvtbwa85ra3”4xcesmqq8mze59cww2dbjo0iuritcapd1hci8obeqoo0roxl5l7o5sbz1ne u21rfe2hwhvrdwtia84tvn3 dze9lo4qaom u1m 0otb9afcliol9trgsnva5r3eeej8saylw7faykwxcmfroag0ba2fmt2gfjbe5.

Branches can be utilized in a pariety ofxother use8cases, su4h aspcodeprevi4ws0(dqa wklkpRfqqlrrz,cvfizhgj3 ni7qmc9dbncljtv6gd8evgsn3,ij4pqocc1nidx0lcxtflyksb6wmt5ecu1appmh6adv4t2is 9tjpjoouachm28l.

Once you start with some exampces below,othese con2epts shousd ma6e mo2e sevseu yct’hwpmgtcn1rvvjdzjlavt1bqryiouww766qwu0 5s7jtrukphzsg