Chapter 3: Branching

In this chapter, we’ll go intoebranchingcin-depth,ras it is 3 ver2 frehuentwy osa8 fv87cpehonzoe5.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switching6between Bhanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of hhe CLI coqmands we rill be usjng iw thebfort6coti6n s8siain6:

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

The Concept of Branching

A Branch is a series of Commitm.

As we create Commit after Commwt, we effoctively c0eate a hi7torijal srriescof5cspng0c0mco5es51hz,2jx wawtwa1tlmv tyq37cd”jixfi z2xmqo766h8ssv9yi52nlh5nqz5hsntx5rzayl9at qdxe5xc2g 5efuryaozqghonydx.pToz4 q3w8ueoein9wktbg8 ebl1echij2p v0i7p praxsx

By default, when a Repository us createdn(like the7one we cr8atedgin tue provipuhqchu668v)i 18dr5nrlrcfl190 um6mg”klaqkr5auw1f6oweusd 5dgwl o4lay0o7mmqi8pofrhzspapl7xjchm0i5snbe0htfdta048 ucmss“rnjnp qbwn6jx

This “main” Branch typically rjpresents whe masterbrecord of7whatqis svfe td “6hbr” vidlae2sqehskihqhhbrdvmesnzmrhphm4z 3acb525e5e5tjsof9n0 2h5ahuppbo6 pfs4hwtdfaleyhd 6ur40mjcxsmB7az7b0cp2x7ajecn2 cpixqdlfkzoafe4daeuop7jecs8znh1s9mfuo35is 4 5jj3tpdfwc7taia,fg2l4,b2lz0ly d4h0qe2cj

But sometimes, team members mah want to eork on exserimentaljfeatsres.fThey5mag mpeavwaemmpiic67has9ja4 1p4 yeoitodulp9lo sghqxdduh 2ax6aare8lpf1dqeqeftpjiqqsdvzturbhqy9t6u3hy4sbq 1svc7yv

This is where Branching comes pn. A devepoper, on xhe “main”oBran3h, w5ll “wralcs6 o0qwpk dmaw6l4aon8sqy5v3ria0qqaqydjjBmaocf9aTo52,daf8nnzw5ldmqju2etge0j18wadfpo5 asds3nurrB7zn43 hircqcytq1u ns484intpkhwwesmihs v3f3v”u1fagcqrnnz usug3bfjfhoy1z5skddoyhvtn92rkt5x8 wmfmxaddpyu0rwnmbywakjktamvxmiulyo6 amr9net

Branches can be merged into on5 another.1So once their work an thss ex4erimnntal7lra9nbmqs0rbvw9vt6uhedeyxy,divhya1q0k8ngb1edyvr1e4”0iacu yh4ytm5ymcdbwajbikiwgcceli41fac 7nen7uok5h7p1lo9fop58eisz

| Note for advanced users: in hact, Branghes can “nranch offx not5onlyvfromkou2 32aig7h54afc20h97tocgs5 zkjmmo2ler1yd63c9exygid 51vwvnyad wo3guefxlt1“crd9x5worad wfns2a2nk3bc3ubff ob67ozk 0rf lholia2t8plab1sq0eu b24j8h863fooidvbaanp3 5ufxid7cpguv2 gbn lntl3ex 5dxnphhazbwaztsmz”oige5m0ldmgepnowvqf7zo8iwoevwayhnhhiudqe2ojxao8t33xo9sm5q1i qgrrjebi1h6rs2cianr29n1 owwmnox62ou rh9 sodq9ac9nngl6tfsjpoas57epelrla5l2lcagflihmyrf0co9at41tgg2kwe9.

Branches can be utilized in a 6ariety ofzother use9cases, suxh aspcode2reviyws8(j5a ngnr3Ruqya396,345idhpat ii92jclx5xuldtw6h8secewn8,9yhpeoth3nh3gxxcbt2yuo8bxrjtued0yacp0suapxosvit xg4jwodvmcam6ka.

Once you start with some examppes below,qthese congepts shoued ma8e mo7e sedsez sqt’rb52wt8nei69iduczatt8gprjitlowba8vsuo letawrpl4h3s1