chrisn wrote:Thanks, but really I need the pull request to be on a topic branch rather than master. I'd like to keep the commit history as linear as possible - much the same as the approach taken with B-Em (see the guidance here: https://github.com/stardot/b-em/blob/ma ... PATCHES.md).
In updating to VS2015 I created new project files rather than upgrading the existing ones, to reduce the amount of cruft introduced. Both the Debug and Release configurations work for me (x86 only, I haven't tested x64). But if there's an issue with these, I'd prefer to fix it in a separate pull request.
Hmm, if you want me to do it exactly like that it will have to wait for a while as I took a different approach. I branced from 4.14, made that build with the Sprow code, then merged in the master branch to add the latest changes and after that one built I pushed it back on my master branch. No rebasing as I've found that a bit unpredictable.
I can push the work branch if you can work with that, but if not then I'll have to start from the beginning again.....