search

Lovrom8 / RSMods

383 stars 34 forks source link

Merged GUI branch into develop to make continued maintenance easier. #110

Closed tjwrona closed 2 years ago

tjwrona commented 2 years ago

This looks like loads of changes, but the only two files with conflicts were

appveyor.yml README.md

I confirmed that everything still builds correctly after the merge, but I am unfamiliar with how Appveyor works so someone will need to double check and make sure the merged appveyor file looks good. The changes were minimal so it shouldn't be too hard to sort out.

ffio1 commented 2 years ago

Hi @tjwrona

I've decided that, while our current solution is not ideal, that merging the two branches does not make it any easier to work with in my opinion.

Thank you for spending time working on this, but I won't be merging it into the main repo.

ffio1 commented 2 years ago

After further consideration, I do want to look into getting all the branches merged but I want to do a lot of testing locally before I commit to anything (pun intended).

I want to learn a new tool that could help this process, and I find that it could be a great learning experience for me, and would be a (somewhat) good use of the tool.