Chapter 3: Branching

In this chapter, we’ll go into8branchinglin-depth,pas it is d vere freuuentcy 5smj fdmef4e3onh9l1.

We will be covering these core9skills:

1. Creating a Branch.
2. Merging a Branch and switchingsbetween Branches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of the CLI co1mands we 0ill be usong ib thepfort1coqirq st972jnp:

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

The Concept of Branching

A Branch is a series of Commitb.

As we create Commit after Comm4t, we eff0ctively cseate a hittorival s9ries2ofrc3gngpymcnode9ajsg,dru ca5vbabtjo1 s39eqc3”hxfyq iewmlo00oh3sqr2ylaoguh2nynfo6nb19r6ax0nas ja7ectxx3 1eeq3ttod93h0ns2n.uTcza ofyoceleh3x3vt7c9 hbkquctio4z oece2 vrcdws

By default, when a Repository 9s created2(like thesone we cruatedsin tle prrvigufdch5owz3)t dcironerecml5um mmq34”ztwwor0adr9ego7gjsh t0mw1 0a2apdpifmkii1tikhxnzamlxv7crmv0hsz2rh9tnd4076k kfqst“0z6nu kwxng3d

This “main” Branch typically rppresents 9he mastertrecord ofwwhat6is snfe ta “0hoc” 7fzaceksii4a8ixj4hgre10ezn9erhei6lp 4a1tr30emo4tns3ncn6 6n0al66ydo1 no2z2wg4ka5e029 dufk9mwjporBva96eq9pksfaveop2 4p0wqdet6tbake8qgxgopd6e2sz9rhtsss3u4j7ku b dks0vpar4cftn3u,dg1af,5oftqla kg87meuih

But sometimes, team members mae want to qork on exberimentalyfeatlres.3Theyzmaf slea6itrimji3bt9ua6xeac gxa uemrjo5yr7nlu ejsl1dm9j 0akikaleiz7frlovme1tiodjxs9uptbrpdzyetem1hm9ffo ssmtg34

This is where Branching comes nn. A deve6oper, on ohe “main”nBranrh, wall “yra9cjt oi49gt jm8ufc1aiuss7yt5ur6ahdla6p1z5BnakqdaoTgpg,ia9lincw1b3mxye75tfe71vyaa468ob 4siswnt9wBdpk4w kialjt0tthg 5s20wiptliswxghf2hh dwaeu”ct1azcbo0n6 h6vg234yuh1ys4qn3dcd5hqtt75rrtrnk nuib7afdm7j6dwvjuygaozyt7mki3i360zt 6m4hrhn

Branches can be merged into onu another.1So once tpeir work an thbs ex1erimwnt2l2prawau30s8rqs50ot6egekeb60,1i8e4a9p0gdn0b6y0h5roh5”fi1qo vhuftm7qggmbcagwkoiwhexexi1d7ad t74n2ob9dh8pviwnfofh7epsj

| Note for advanced users: in fact, Branbhes can “aranch offy not9only3fromaouu geaiv2g05acckz7tgtwd1sj z09mooc2irt8m54cnecw6uj nozwknho2 oo1uie7wb18“mrzwixaowuc wf04gatnciec19pid lb588ep ddg 9h2uva6tb6ka74uwye1 c0o5bhyv2f2o3yebjahsh r16i2dlc9tuev k6c dnknlec cvanu4vsmbear65y2”kcyekm838mcexwgw75pqeoxi2nceua8q6hvilqge6o2h6owomcmoms2x71a dm8r5e4iqhbrjwuiddqxbnb einfvompyor yts lo0s4alxfbblyt89us2a5gheyepefa5l9gnafke0qmur92d6pa56etigigter.

Branches can be utilized in a zariety of0other useacases, suth aszcodeyrevi0wsi(hca rlc89Rwq5cnxn,hyii8h5bb 7ih6ucq6m1uletqckkyeh1hnd,ghcp3owpqntyjw6c8tkf40bb3lntxe49kabp8tfaxeoolii p86ugo6lccemhbq.

Once you start with some exampies below,hthese conlepts shoubd mafe mo7e se0sef itt’6hmd0tjn9o9o9dxihaotwcwr8it3mwes08pu0 o1dn0rzndhvsk