AVideo icon indicating copy to clipboard operation
AVideo copied to clipboard

Git pull bug?

Open para2022 opened this issue 10 months ago • 2 comments

Updating 25cccf861f..980d7542f5 error: The following untracked working tree files would be overwritten by merge: node_modules/@videojs/http-streaming/src/util/media-sequence-sync.js node_modules/moment/dist/locale/ar-ps.js node_modules/moment/dist/locale/ku-kmr.js node_modules/moment/locale/ar-ps.js node_modules/moment/locale/ku-kmr.js node_modules/moment/src/locale/ar-ps.js node_modules/moment/src/locale/ku-kmr.js node_modules/video.js/dist/types/consts/errors.d.ts node_modules/video.js/dist/types/consts/errors.d.ts.map node_modules/videojs-contrib-quality-levels/dist/types/plugin.d.ts node_modules/videojs-contrib-quality-levels/dist/types/plugin.d.ts.map node_modules/videojs-contrib-quality-levels/dist/types/quality-level-list.d.ts node_modules/videojs-contrib-quality-levels/dist/types/quality-level-list.d.ts.map node_modules/videojs-contrib-quality-levels/dist/types/quality-level.d.ts node_modules/videojs-contrib-quality-levels/dist/types/quality-level.d.ts.map Please move or remove them before you merge. Aborting

I have done a git stash and still same error


git stash No local changes to save

para2022 avatar Apr 04 '24 12:04 para2022

run this

sudo git fetch --all && sudo git reset --hard origin/master

DanielnetoDotCom avatar Apr 04 '24 12:04 DanielnetoDotCom

Fixed. Thanks 👍

para2022 avatar Apr 05 '24 14:04 para2022