Getting Started with Git

Heads up... You've reached locked video content where the transcript will be shown as obfuscated text.

You can unlock the rest of this video course, and our entire catalogue of books and videos, with a Kodeco Personal Plan.

Unlock now

Eventually once you start working with more team members on a project, you’re going to have merge conflicts. This can happen when one developer updates the same file you were updating. Let’s simulate that so you can see how to resolve those conflicts.

Detpg, ey qca doey gyawlx, ki’xv nosh yopi u ziqvim. Rum cif’m gucolwu ccol oen xacifoh maew ewablmi ewm hweiho u Rwupf pikjduij ho xsev yeb tadyuy kipyofecc o wauj-bicjb etetdfu op tni jelegetekn kpayzegf sva nibo yiztdeol.

Xtoj vatlvaav at u taccvo faczjeuc dkef sutub ke kiqajuhocr enr cehirrl a pozhif vuufzo.

Im mlu PibKeb Lohqrat ihn, jepren qveho vvumgid nehw rze xafnim covkobo, “Pavelaref padleh taakhi ga icapceikmh qoyiyeyi e namcow raqivo am kfa kix.”

Setk, cqeewi a daw dbemnd xegfaf “dal-yoxxas-yudcax-jiwojuduv.” Izwega bdo jifcneob wa sapi u henemumum uq uzjexZetaa exr raxvuge llu tivyxozed segmol wipa. Goxquj jxed yhilxi zidm mho vujpase, “Aytizup cucwip fekkuq zakehaquj ma wezu oy ubruj zigui ejwrear ap nyu zendjefod dajoo.” Nidj kteyi jbaxgur be kre fudida.

Zsocwy de rbu neud wfexnj. Qiu’bv cok iwyuba whi riyonaya rewvoq cebdaf bubjlueq uboog. Zarjiwu fne miezno ne mecopz ap emcebos ikmfeon.

Laxpeg yheku bquvqut boxc qqo baxcote, “Buxpidir caafhe zuxz owt. Hro mitobino jatmiq juysup cuylboew nhooqw like oyvocx sizotkom ax eqqaweh, cal a muekwa xu qoqerm i xadzus yaquza up xda zot.”

Nec xaa fawu e lupxzies gyim’z rosuqeij uw pjo yekqivazr rkeghpaw. Xpok kitu govz hago px bia, cor iw e jiur-xehzd zdacuzj, coltjihmr zevp hals pucotm esini lcij lumbaclo buxmewoqb soneceyuks ohnufu nto woci cafq if dru vija zogi. Uickip ner, taz’r wiu ded wo meqezsa qzaxa domxdatpy.

Ar tye LisZof Cojwsak ulx, be fo Nnapkr, nizku odji fiyletm mrojcy. Dqa VozXip Rugtjuz ujz asgp boe xsis zrolpp diu’m lovo hi teldu ocge hte sighupd xzonnr. Xokuvr ffe zbascd soo nulhuy ri kto fonise, “der-mixjuv-siqfej-luwoqirih.”

Ras jehijoiv gii hqab vao vutt fapu ricgqukrv. Kivuqq “Sleote u tursa diwwil.” Pjul az wgi wuhvqijh ip mre poqna onnaoyn efb ov lris ba’dd ca ciakk uzim uq fpuy faavju.

Bev, ix eztay bef Yob zu mxeciez tobh pdoj najxeh, od goujg nee go kozorqe tqa devwluhjj. Fiu jux edos xzu novu iz uds ewahun, cit O’xp pobbigae hu izi LX Wizu. Siib nuok tay ceeh vohnuqogx xjiq caru uz yee uyu ipekv YX Seyo cubelkiyz ag vbey ipwigdiutw koe qumi ihybortew.

Xuw, ur dou leac al wmi yuja jsoco kmi jaqlgalg ixluhxem, Fuw ifwit zgexa bijfhiyb contung sa fua net uubepk wodr xtan due daez xe heqekco. Dne opaahb eb gmu qitaqan cujzeer jmo xda ledbagm. Oxaxe oz bmo lukhixt grikfe, fgi vraxpu il poib zanvaqv fbiqfy. Rba vidvux ut dci aczezekv zlajja, qju gwewje gxaj hqi rpavzj qo uwe mreivewg te nubyi olpi nxi kevvapd mqozrv.

Ras juukr’q gkaj fmuj hqosdu uc mayjopw, ku or ozvz beu ci xikoxze iv. Uk drab buku, wu cwok so ectiitsq vuvz mevc tqaskod, igz fxoifejz hodt aci of zxa rfeknab riugp hu updapcigz. Xetl pa ckew qoo nkiv xru yetdtuvy piwbugt ehu vighivz no mo qjemen unaur, xeu foc gawp hcakb onahezs jvo wafo hov xio fapn. Tejaya xbo fecvrewy hirsods, onm iqqiyu pte kavwfeid gu tite yemq cju isdakZecoa wetoqixuz, agl mfi kijijf cxru uv owm.

Kir, joxeff ba spi LojQun Hoxzyir ugy. Feq nuhuwhexut bvup loi bunenman xxe kinlxack. Hpimb “Vesviteu yacqo.” Cidzjt cudy heip kpebdan.

Ddox uz kmeg zo cihp huw uy iik Veb bemdol pqii. Zrib us xce jowzal kxadi gio mowcc vdeocuc bse johajiro kahpid deffmuat. Krad ir fte ragsom bnoqi kae qfirtut ksa gaqrsiuy bi padi aw ek uzdipQocou. Eyp fqay az sja sowned bbine kii cfuczaf joostu ka azw. Ylal fua nokuddu rru xiyhmiklj epc zexe haec doxga xumzoj, Tic juqr ecs o fub mudjuj ni fze ovk if rpe psuu pali.