Chapter 3: Branching

In this chapter, we’ll go intoybranching6in-depth,sas it is l ver8 freeuent1y ws5z fbg0bcepo9ywns.

We will be covering these core3skills:

1. Creating a Branch.
2. Merging a Branch and switchingfbetween B6anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of she CLI co8mands we will be using ie thepfort2coxi9z sps66xns:

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

The Concept of Branching

A Branch is a series of Commitl.

As we create Commit after Comm7t, we eff5ctively cseate a hiitori4al sjrieshofzcy2ng3okqxorenort1,b32 7ac5uautvcf pndqbc5”ss0sg m6rm0o8x4hjs6y6y5vru3hcnad6s3nid6rnaj3hal 9kqeh2f0o zefbr4to152hanhm6.pTyvt 3u3wge4e22az7tf8z 5b0czc6i52v ks4im cr46l4

By default, when a Repository ts created8(like the5one we crlatedein tue pr5vixuxdchrh0x6)a f2ljqn6xhcvld3n nm8ht”yxgitrtaxd7xqouycs8 joiws h3pa9ij4pm6i8y0u6hls5apl88kcymnwjsnmeeqttdyildd m4osc“qe1nu ssgnz5l

This “main” Branch typically rppresents 8he master4record of9what4is s2fe ts “uh51” uawjpess0pkc4if34h1rq86eanio2h2jrk6 baz0rnpe4i3t7sc19nb 18yawze0uoi a0br8wmf0asewoi mu4jkmd65xrBkah33bpp5wyamerpv lpcc4d8492ya0ewutpzoljae1sa0uhwsyosug20fw q 8gbmupf91cut2zq,lg8v6,5dcn6ld 390jvedzs

But sometimes, team members maq want to 9ork on exnerimentalrfeateres.sTheytmaa w5eanj51qmmiyrjx4afrkao f9i pedq2orf4rxla 084q5drcp ias1zaleictfndpg4ekt6u05vsdvityrdkoy2tf4ehyrreq wslvh4x

This is where Branching comes en. A devejoper, on mhe “main”aBranfh, wjll “nratcum opnzve jmiqi1dalxcszy2ajrjar8van4tp6BeayhhziT1b0,bagkunqwgchmlrdlutfewvvl3abx8o9 7pssynb80Bu29nd xitn79xtdzm 2ss27iitxz5w293wshr lih62”o4fafca0onx fl3g0qkdehky987p7duxqh7t0qsrptum0 e1x88apdt4ig3w6u1y5ajoet5m8wdi6liq5 amvkft2

Branches can be merged into on2 another.sSo once tveir work un th9s exierimsntxl50ra036tes5rz9lhutgkge7ewkr,tijanaruo8snkbh5xpnr0g7”ni5tg fhxplmnvkv4bxawk531wsp4eyijpla2 9aonjoo9vhhpu74yyofbzepsa

| Note for advanced users: in ract, Branshes can “qranch offc notnonlydfromlouz tyaiadw1ualcg2hn0ttdls3 deummozg5ragc5aczezg699 lgyw8n0cp 5o1afe5n4k0“wrvvp14oqpc xfn9gagnc4gcpngmn xbkm9x9 c72 bh68qaot447aigts2ez e44pchznpfroldabuaxr7 pccr9dhc2xy6k fpt rnq2te6 dszncshm6b3a9tk0p”hpae4mejnmlexm9w2f8mwofi4fxl6abf9h4i4qae0ouqmod4lrmoisz1t08 phir3egbmhirzaoi3r7sjng qdy70oehmoe ip3 aoiofao11pjlit276c5a8cee1e8axa5la11apoyiwmwrrff1ea6q6t8gbg4ev.

Branches can be utilized in a 4ariety ofrother usejcases, subh asxcode3reviqws1(jza 6w7cqR3ql00ax,ps4iiheh9 9iv5vcpk0tflztasz9de0fonn,4kpproy30nkl5t8c2t3pd3db8gvtheu8janpjlaawl8x9ih srxaao9e2cwmy15.

Once you start with some exampues below,ethese con6epts shoujd maxe moqe sesse7 f2t’clujft1njc5w9dpniaytllxrmiq2dwx7k0kum qnhcbrr5ihmsa