Working with rigoblock website requires manually changing the url from localhost to rigoblock and adding a cname. While this has been done on the website serving branches, a conflict has arisen where the files are overwritten in the working branches, and try to get to master, which they shouldn't. Must fix the conflict to allow for:
working on localhost from master and all derives branches
keeping cname and url to static.rigoblock.com served by netlify
keeping cname and url to rigoblock.com served by github pages
gabririgo
commented
3 years ago
Working with rigoblock website requires manually changing the url from localhost to rigoblock and adding a cname. While this has been done on the website serving branches, a conflict has arisen where the files are overwritten in the working branches, and try to get to master, which they shouldn't. Must fix the conflict to allow for: