git pull develop branch giving me this error
-
remote: Enumerating objects: 91, done.
remote: Counting objects: 100% (23/23), done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 91 (delta 17), reused 15 (delta 15), pack-reused 68 (from 2)
Unpacking objects: 100% (91/91), 478.92 KiB | 783.00 KiB/s, done.
From https://github.com/christophhart/HISE
21b72ef51..59dab9965 develop -> origin/develop
Could not access submodule 'tools/api generator' at commit ac310046d
Could not access submodule 'tools/mcp_server' at commit 52e9ded82
Updating 1791fe98e..59dab9965
error: Your local changes to the following files would be overwritten by merge:
projects/standalone/HISE Standalone.jucer
projects/standalone/JuceLibraryCode/AppConfig.h
Please commit your changes or stash them before you merge. -
@jenö What changes have you made to the juicer file?