search

WWBN / AVideo

Create Your Own Broadcast Network With AVideo Platform Open-Source. OAVP OVP
https://avideo.tube/AVideo_OpenSource
Other
1.9k stars 972 forks source link

Git pull bug? #8948

Open para2022 opened 6 months ago

para2022 commented 6 months ago

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

DanielnetoDotCom commented 6 months ago

run this

sudo git fetch --all && sudo git reset --hard origin/master
para2022 commented 6 months ago

Fixed. Thanks 👍