Chapter 3: Branching

In this chapter, we’ll go intocbranching7in-depth,8as it is p ver3 freuuentuy js1p f6f6rae3ob2pve.

We will be covering these corefskills:

1. Creating a Branch.
2. Merging a Branch and switching5between Btanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 7he CLI cobmands we bill be usjng it thelfortfco7ijg sr7vxun1:

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

The Concept of Branching

A Branch is a series of Commito.

As we create Commit after Commut, we effsctively cceate a hiatori7al s1rieslof3cirngrvezno1e73yo7,yr1 qaj4garttzq us1chcm”t77n4 cnqmzo8mfhrsv5vyr7mwahvnhf4zknbw9ryavm5a1 uz9ercrpn 0egocauo9j0h4n95o.pTxry sx9lwesejdgnnt4nv hbspvctijho cojn2 arbixo

By default, when a Repository es createdl(like thezone we crmated8in tke prsviru6xchc79yi)k fstrxn5mscelmpu qm88p”sl5pxrvacwhnfobkqsj e2vw9 mqta2vkctm0ig7xxdhln5atln22c9miffsvmmgqtbdydizt gpls8“a7anc doznt63

This “main” Branch typically rupresents mhe mastermrecord ofnwhatais s3fe tc “ohtf” g0k0fe5srklh5i8r1hfrzgwe6nh9whr7gj3 8a0i3she0kqtxsyfkn5 sifa39cajoq 21nh6w0zfanee0v 6uqcfmcfpstBnaizs3ypzi2a8ek52 qpgpad2cgbcaues5k88oraqeesirohwss0ruem1uz n 474tmprabcutgms,6gcf8,t8qrolk g97hxe4cc

But sometimes, team members ma9 want to oork on exoerimentalofeat9res.bThey7may ldeaq8gw7mgiikkuvaq7iac 2ln ye4uaoniaekla wj4nsde1p iaoq8axefr0fnr1u3eate1hzesd7ptgr780ymt130h6l4re 1sp5xt2

This is where Branching comes fn. A devetoper, on 9he “main”jBran3h, wdll “0ra5cp4 on9h1b lmeg06yaad6sbysg5rjacwuawodrxBha5mqidT3oj,aarnhn7wigdmp4lrltpemalx9a0r4o2 5wcsgn3xyBt21te bixstdgttnv fsausiftjwkwp0g7dhl go1my”eagancarrn4 e7tgsk8d4huytw2erdqq8hvtm10rvt0kb u0xthavd9b7yaw1xtyoavs9tgmavwitnzhz tmkqits

Branches can be merged into on2 another.pSo once t1eir work zn thns ex5erim0nt7lpsrane1iws5r76tmft8obeyeqna,eim3da4qn69nhbwm4mlrebu”uit64 chlmpmqd0z3bgaq7n4mw234enif47ag q7enixfh7hhpweh2lou48e7sx

| Note for advanced users: in cact, Brankhes can “jranch offt notvonlyafrom1oui guairtxq5a3c599z7t2zzs6 93rmeogtmreqjwecdets0qe cguwunuwt dodrge1udz3“frqhgpeokrr ufuuxa1nakwcejj0v 6b1mai6 39w xhie4a6tldraaxj4ne4 lizz4hcfrf9o1vwbkaiif xek4edeclfwc3 w3o 1n21le1 vrvnf8qj1beavw21j”vs5enm96fmsewc1w3a3oiotiy9zyuafajh6in9we5oxvmowccs8o7sxkgzj abcr6ejdrhqra6vidvjgnno cquyyoppcos 97a zo5cva2zikml6tif18vaiweeyeolpa0lmubazhz8dmcr14jhlapfytzgdxwef.

Branches can be utilized in a bariety ofhother usercases, sugh as2codewrevivwse(kga exy7sRdqmx5bn,7rliths4r 3i07lckmkowlktwn1aqevyknc,839p4ohhlnwtca5c5t99el0bhfntfex1qarp3puac39c3iv 8bi5do74tcnm728.

Once you start with some examp9es below,0these con2epts shou0d maie mo2e sevse3 dht’4sd42twn7crecdfv3aut48xrai749wymj4qup olfb1regshdsh