Main has the landing page and some other frontend features added that b.dev doesn't. I changed the file structure in .dev so it can't auto merge. To get around this I'm going to move everything in root in main into a 'client' folder in the same way I have it in dev. Once its in this folder, I'll be able to git merge and just have to solve any merge conflicts. If this isn't successful, I'll also create a 'server' folder and hopefully github will be able to auto merge at that point. Lastly if all else fails, I'll manually go in and replace the necessary files.
Main has the landing page and some other frontend features added that b.dev doesn't. I changed the file structure in .dev so it can't auto merge. To get around this I'm going to move everything in root in main into a 'client' folder in the same way I have it in dev. Once its in this folder, I'll be able to git merge and just have to solve any merge conflicts. If this isn't successful, I'll also create a 'server' folder and hopefully github will be able to auto merge at that point. Lastly if all else fails, I'll manually go in and replace the necessary files.