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

[UPDATE] Error Git Pull 9d1ad67b23 - 32386e9c90 #9486

Open gbrn opened 2 hours ago

gbrn commented 2 hours ago

@DanielnetoDotCom Danny, I encountered the following errors when spinning GIT PULL. I didn't make any changes manually, it just says update some of the plugins.

sudo git pull
remote: Enumerating objects: 264, done.
remote: Counting objects: 100% (264/264), done.
remote: Compressing objects: 100% (112/112), done.
remote: Total 217 (delta 173), reused 149 (delta 105), pack-reused 0 (from 0)
Receiving objects: 100% (217/217), 50.08 KiB | 2.64 MiB/s, done.
Resolving deltas: 100% (173/173), completed with 41 local objects.
From https://github.com/WWBN/AVideo
   9d1ad67b23..32386e9c90  master     -> origin/master
Updating 9d1ad67b23..32386e9c90
error: Your local changes to the following files would be overwritten by merge:
        plugin/AD_Server/AD_Server.php
        plugin/AD_Server/Objects/VastCampaignsLogs.php
        plugin/AD_Server/VAST.php
        plugin/AD_Server/install/install.sql
        plugin/AD_Server/log.php
        plugin/AD_Server/pluginMenu.html
        plugin/AI/AI.php
        plugin/AI/tabs/dubbing.panel.php
        plugin/CDN/CDN.php
        plugin/ImageGallery/index.php
        plugin/Layout/userAutocomplete.php
        plugin/Layout/videoAutocomplete.php
        plugin/Live/Live.php
        plugin/Live/myLiveControls.php
        plugin/Live/standAloneFiles/restreamer.json.php
        plugin/PlayerSkins/PlayerSkins.php
        plugin/PlayerSkins/events/playerAdsEvents.js
        plugin/YPTSocket/script.js
Please commit your changes or stash them before you merge.
Aborting
DanielnetoDotCom commented 2 hours ago

Probably a permission changed. so it is changed to git.

https://github.com/WWBN/AVideo/wiki/How-to-Update-your-AVideo-Platform#resolving-update-conflicts