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?
-
@jenö I just got the same error, claud send me in the right direction. I opted for the stashing option.
You have local changes to those files that would be overwritten. Since those are auto-generated Projucer files you probably don't need to keep, the easiest fix is to just discard them:
git checkout -- "projects/standalone/HISE Standalone.jucer" "projects/standalone/JuceLibraryCode/AppConfig.h"
git pull origin develop
Or if you want to stash everything just in case:
git stash
git pull origin develop
After that, run:
git submodule update --init --recursive
Note: you'll also see warnings about 3 submodules (api generator, hise_lsp_server, mcp_server) being inaccessible — those are likely private repos, so you can safely ignore those warnings. The important one is JUCE, which updated fine.
However now I'm building, I'm getting this. My guess is something whent whoopsie;
*unresolved external symbol "public: __cdecl hise::RestServer::RestServer(void)" (??0RestServer@hise@@QEAA@XZ)
'unused': unreferenced local variable
'unused': unreferenced local variable
'unused': unreferenced local variable
'unused': unreferenced local variable
'hise::InteractionTestWindow': type name first seen using 'class' now seen using 'struct'
'r': unreferenced local variable
'unused': unreferenced local variable
'unused': unreferenced local variable
'e': unreferenced local variable
'hise::areMajorWebsitesAvailable': unreferenced function with internal linkage has been removed
ignoring '/INCREMENTAL' due to '/LTCG' specification
unresolved external symbol "private: void __cdecl hise::RestServer::AsyncRequest::mergeLogsIntoResponse(void)" (?mergeLogsIntoResponse@AsyncRequest@RestServer@hise@@AEAAXXZ)
unresolved external symbol "public: void __cdecl hise::RestServer::AsyncRequest::appendError(class juce::String const &,class juce::StringArray const &)" (?appendError@AsyncRequest@RestServer@hise@@QEAAXAEBVString@juce@@AEBVStringArray@5@@Z)
unresolved external symbol "public: void __cdecl hise::RestServer::AsyncRequest::appendLog(class juce::String const &)" (?appendLog@AsyncRequest@RestServer@hise@@QEAAXAEBVString@juce@@@Z)
unresolved external symbol "public: static struct hise::RestServer::Response __cdecl hise::RestServer::Response::error(int,class juce::String const &)" (?error@Response@RestServer@hise@@SA?AU123@HAEBVString@juce@@@Z)
unresolved external symbol "public: static struct hise::RestServer::Response __cdecl hise::RestServer::Response::ok(class juce::var const &)" (?ok@Response@RestServer@hise@@SA?AU123@AEBVvar@juce@@@Z)
unresolved external symbol "public: class juce::var __cdecl hise::RestServer::Request::getJsonBody(void)const " (?getJsonBody@Request@RestServer@hise@@QEBA?AVvar@juce@@XZ)
unresolved external symbol "public: class juce::String __cdecl hise::RestServer::Request::operator[](class juce::Identifier const &)const " (??ARequest@RestServer@hise@@QEBA?AVString@juce@@AEBVIdentifier@4@@Z)
unresolved external symbol "public: void __cdecl hise::RestServer::removeListener(class hise::RestServer::Listener *)" (?removeListener@RestServer@hise@@QEAAXPEAVListener@12@@Z)
unresolved external symbol "public: void __cdecl hise::RestServer::addListener(class hise::RestServer::Listener *)" (?addListener@RestServer@hise@@QEAAXPEAVListener@12@@Z)
unresolved external symbol "public: int __cdecl hise::RestServer::getPort(void)const " (?getPort@RestServer@hise@@QEBAHXZ)
unresolved external symbol "public: bool __cdecl hise::RestServer::isRunning(void)const " (?isRunning@RestServer@hise@@QEBA_NXZ)
unresolved external symbol "public: void __cdecl hise::RestServer::stop(void)" (?stop@RestServer@hise@@QEAAXXZ)
unresolved external symbol "public: bool __cdecl hise::RestServer::start(int,class juce::String const &)" (?start@RestServer@hise@@QEAA_NHAEBVString@juce@@@Z)
unresolved external symbol "public: void __cdecl hise::RestServer::addAsyncRoute(enum hise::RestServer::Method,class juce::URL const &,class std::function<struct hise::RestServer::Response __cdecl(class juce::ReferenceCountedObjectPtr)>)" (?addAsyncRoute@RestServer@hise@@QEAAXW4Method@12@AEBVURL@juce@@V?$function@$$A6A?AUResponse@RestServer@hise@@V?$ReferenceCountedObjectPtr@VAsyncRequest@RestServer@hise@@@juce@@@Z@std@@@Z)
unresolved external symbol "public: class juce::URL __cdecl hise::RestServer::getBaseURL(void)const " (?getBaseURL@RestServer@hise@@QEBA?AVURL@juce@@XZ)
unresolved external symbol "public: __cdecl hise::RestServer::~RestServer(void)" (??1RestServer@hise@@QEAA@XZ)
unresolved external symbol "public: static void __cdecl hise::RestServer::forceRepaintWindow(void )" (?forceRepaintWindow@RestServer@hise@@SAXPEAX@Z)
18 unresolved externals
