This forum is only for questions or discussions about working with the mojoPortal source code in Visual Studio, obtaining the source code from the repository, developing custom features, etc. If your question is not along these lines this is not the right forum. Please try to post your question in the appropriate forum.
Please do not post questions about design, CSS, or skinning here. Use the Help With Skins Forum for those questions.
You can monitor commits to the repository from this page. We also recommend developers to subscribe to email notifications in the developer forum as occasionally important things are announced.
Before posting questions here you might want to review the developer documentation.
So I was getting ready to grab the last major update into my local repo and realized you changed from Mercurial to Git. This is a problem for me because I already use Git for my own version (with my built features and customizations) and there's not really a supported way of having two git repos in the same folder. So, how am I supposed to reconcile the changes between my local Mercurial repo and the new Git one?
I'm tagging this post again. I would like to update my working version, but changing from Mercurial to Git has caused a conflict with my own source control. Does anyone know how to reconcile this properly?
Hello Mike,
I'm not sure what to do on this but I believe this answer on Stack Overflow will work for you.
Of course, you should create a backup of your local repo before you do anything.
Hope this helps, Joe