Closed wassupluke closed 6 months ago
I'm not sure if I did that correctly but I sync'd both this and my main branch with the upstream hhursev repo. From what I've seen on my end it looks like this pull request now only changes files and lines strictly related to adding support for pinchofyum.com. If I still need to do something differently let me know.
This pull request contains a lot of the same code changes/additions that take place in #969. I think what happened is that you made the additions included in 969 on your fork's
main
branch and as a result those changes were carried over into thepinchofyum
branch you created.In order to get these changes ready for review we'll need to reopen this pull request as new one, including only the changes for this site. I'm not too familiar with github's setup for these types of things but i believe your best route forward is to wait for 969 to be merged in, once merged you can make sure your main branch is synced with the main branch here and then recreate your changes in a new branch on your repo that contains only the changes for pinchofyum. It should be as simple as copying and pasting the changes introduced here into a new branch once created.
Let me know if you have any questions or otherwise you can give it a shot once the other is merged in.