To update your branch:
git fetch --all -p
git checkout jsonsaveload
git pull origin jsonsaveload
git pull upstream master
Resolve any merge conflicts and then:
git push origin jsonsaveload
To push the merged version back up to GitHub and it will update your PR.
Now then, performance.
Are you running on Windows using Visual Studio 2013? In that case there are four build options:
- Debug - full-on deep paranoia checking of everything with full debug information and no optimisation at all
- PreRelease - full debug as above but with some optimisations
- Profile - same as below but with intrusive CPU performance profiling enabled
- Release - full optimisations, most debugging facilities compromised or disabled, no asserts, go faster stripes
Debug is extremely slow but as you can imagine it is checking everything, you can often just use
PreRelease for debugging and testing purposes.
If I am actually tracking down a specific problem and know roughly the area it is in then I often run the game in Release but I place a line like:
above the function/method that I want to debug. That almost always allows breakpoints to work and give you the local/global/member variables within that methods scope.
You might have to use that for a few dozen functions/methods if something is very complex but the rest of the game will be running at full speed so testing can be far less time consuming.
It can take a couple of minutes for Pioneer to start in a Debug build. but never 15 to 20! Well not for me anyway :)