git merge upstream/main
So I executed these commands as provided in the OpenSaas Docs:
git remote add upstream https://github.com/wasp-lang/open-saas.git
git fetch upstream
git merge upstream/main
With the last command I get this error: fatal: refusing to merge unrelated histories
GitHub
GitHub - wasp-lang/open-saas: A free, open-source SaaS app starter ...
A free, open-source SaaS app starter for React & Node.js with superpowers. Production-ready. Community-driven. - wasp-lang/open-saas
5 Replies
Hi @Louis Deconinck. I'm kapa.ai, your friendly support bot. I will try to answer your question by searching through the knowledge base. :wave:
----------------------
Hmm, I don't know enough to give you a confident answer yet. The knowledge sources provided do not contain information about the specific error you're encountering when trying to merge unrelated histories in Git.
However, in the context of Wasp and OpenSaaS, it's important to keep your local repository updated with the upstream repository. This is especially relevant if there are breaking updates to Wasp in the future and you need to pull those changes into your own repository where you have your project. source (https://discord.com/channels/686873244791210014/1210312601158946826)
For more detailed help with Git commands and troubleshooting, I recommend referring to the official Git documentation or seeking help from a community like StackOverflow.
----------------------
Note: you can ask me a follow up question by @ mentioning me again :speech_balloon:
----------------------
Sorry @Louis Deconinck, I seem to be having a bit of trouble. Don't worry though, I've pinged my support and they will try to fix me up! :technologist:
Perhaps try again in 15mins?
It was a public holiday today and most of the team was off, we'll get back to you tomorrow 🙂
@Vinny (@Wasp) hm why might this be happening? And should we drop this way of suggesting updating the open saas? Due to repo becoming more and more complex, I am not sure if this is viable method any more, especially once the new changes come in. I would probably instead recommend manually updating it. But also udpating is not so crucial for open-saas, not sure I would even push it at all as an idea.
Could this be because of the tag and retagging?
Hm I doubt it, tags are just a thing on top of everything. Maybe there is a too big drift between the open-saas versions. @Louis Deconinck how old is the open-saas template that you were updating?