Cannot upgrade

pnwitguy

New Member
Dec 22, 2019
21
0
1
35
This is what I get when trying to upgrade, whether it's gui or cli. 4.5.15

error: Your local changes to the following files would be overwritten by merge:
app/access_controls/access_control_edit.php
app/access_controls/access_controls.php
app/access_controls/app_languages.php
app/conference_centers/conference_sessions.php
app/conferences_active/conference_interactive_inc.php
app/contacts/contact_import.php
app/destinations/app_config.php
app/destinations/app_languages.php
app/destinations/destination_edit.php
app/destinations/destination_imports.php
app/destinations/destinations.php
app/devices/device_edit.php
app/devices/device_imports.php
app/devices/device_profile_edit.php
app/dialplans/resources/switch/conf/dialplan/010_user_exists.xml
app/extensions/extension_imports.php
app/number_translations/app_languages.php
app/number_translations/number_translation_edit.php
app/number_translations/number_translations.php
app/phrases/phrases.php
app/provision/app_config.php
app/recordings/app_languages.php
app/scripts/resources/classes/scripts.php
app/scripts/resources/scripts/app/follow_me/index.lua
app/scripts/resources/scripts/app/ring_groups/index.lua
app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua
app/scripts/resources/scripts/directory.lua
app/voicemails/app_config.php
app/voicemails/voicemail_imports.php
app/voicemails/voicemails.php
app/xml_cdr/app_menu.php
app/xml_cdr/resources/classes/xml_cdr.php
app/xml_cdr/xml_cdr_extension_summary.php
app/yealink/app_config.php
core/domains/domain_edit.php
core/domains/domains.php
core/menu/app_menu.php
core/users/app_languages.php
core/users/user_imports.php
resources/classes/database.php
resources/templates/provision/yealink/t41s/y000000000068.cfg
resources/templates/provision/yealink/t42s/y000000000067.cfg
resources/templates/provision/yealink/t46s/y000000000066.cfg
resources/templates/provision/yealink/t48s/y000000000065.cfg
resources/templates/provision/yealink/t54s/y000000000070.cfg
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
app/dialplans/resources/switch/conf/dialplan/080_user_hold_music.xml
resources/templates/provision/cisco/spa191/{$mac}.xml
resources/templates/provision/cisco/spa192/{$mac}.xml
Please move or remove them before you merge.
Aborting
Updating e9584fe09..eeb527191
 

pnwitguy

New Member
Dec 22, 2019
21
0
1
35

Looks like this worked! Awesome!