gitQuestion error on pull upstream

So if I try to git pull upstream master and I get this error:
error: Your local changes to the following files would be overwritten by merge: dist/preview release/loaders/babylon.glTF2FileLoader.js dist/preview release/loaders/babylon.glTF2FileLoader.min.js dist/preview release/loaders/babylon.glTFFileLoader.js dist/preview release/loaders/babylon.glTFFileLoader.min.js Please, commit your changes or stash them before you can merge. Aborting

but have never made any changes to those files, what do I do (or any files for that matter in forever)?

I assume I can just stash like it says but I wanna make sure that won’t break anything…

If you never changed them it is weird, you could delete them and see

Delete i mean undo the changes git checkout — dist/.

1 Like

Now after the build if I get this

× 「atl」: Checking finished with 8 errors
[12:29:43] 'buildMin' errored after 1.13 min
[12:29:43] Error in plugin "webpack-stream"
Message:
    [at-loader] ..\..\src\Engines\engine.ts:6536:17
    TS2339: Property 'requestPointerLock' does not exist on type 'HTMLElement'.
[at-loader] ..\..\src\Engines\engine.ts:6536:46
    TS2339: Property 'requestPointerLock' does not exist on type 'HTMLElement'.
[at-loader] ..\..\src\Engines\engine.ts:6537:21
    TS2339: Property 'requestPointerLock' does not exist on type 'HTMLElement'.
[at-loader] ..\..\src\Engines\engine.ts:6538:21
    TS2339: Property 'requestPointerLock' does not exist on type 'HTMLElement'.
[at-loader] ..\..\src\Engines\engine.ts:6547:18
    TS2339: Property 'exitPointerLock' does not exist on type 'Document'.
[at-loader] ..\..\src\Engines\engine.ts:6547:45
    TS2339: Property 'exitPointerLock' does not exist on type 'Document'.
[at-loader] ..\..\src\Engines\engine.ts:6549:22
    TS2339: Property 'exitPointerLock' does not exist on type 'Document'.
[at-loader] ..\..\src\Engines\engine.ts:6550:22
    TS2339: Property 'exitPointerLock' does not exist on type 'Document'.
Details:
    domainEmitter: [object Object]
    domain: [object Object]
    domainThrown: false

[12:29:43] 'core' errored after 1.15 min
[12:29:43] 'typescript-libraries' errored after 1.15 min
[12:29:43] 'typescript-all' errored after 1.15 min
[12:29:43] 'default' errored after 1.95 min
npm ERR! code ELIFECYCLE
npm ERR! errno 1
npm ERR! babylonjs@0.0.0 build: `gulp --max-old-space-size=8192 --tsLintFix`
npm ERR! Exit status 1
npm ERR!
npm ERR! Failed at the babylonjs@0.0.0 build script.
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.

npm ERR! A complete log of this run can be found in:
npm ERR!     C:\Users\pryme\AppData\Roaming\npm-cache\_logs\2019-08-07T19_29_43_421Z-debug.log

Everything should still be all good right?

this is pretty weird and looks like you have some weirdness in your folder. You could try cloning again.

1 Like

Looks like run start worked with no errors.
update
Ew I lied. Nevermind yeah I’m gonna try to reclone.
update
Wow when I deleted the repository folder I had 4+ gigs in there I wonder if somehow it tried to double clone at some point? Is that even possible?