Sonic Retro on GitHub Who? What? When? Where? Why?
Posted 22 July 2014 - 08:36 AM
Posted 22 July 2014 - 10:31 AM
On your local clone, do a full 'git fetch --all', check out the AS branch, and do one of the following:
1. Full merge:
git merge --no-ff origin/master
git cherry-pick -xe (commit-tag)
Cherry-pick allows you to merge individual commits, whereas a full merge merges all changes. In the case of a single commit, a full merge should work fine.
You can then push the changes back upstream.
Reason for edit: `git fetch --all`
Posted 22 July 2014 - 03:52 PM
It's not really that big of a deal though, since it goes away once it's merged back to master.
EDIT: ...if the AS branch isn't actually going to be merged back from master (I.e. considered completely separate), then something's wrong. That's usually not how git development works. Maybe it'd be better to use some macro trickery to split out AS-specific code from asm68k-specific code in a single codebase?
Reason for edit: That's not how it works. That's not how any of this works.
Posted 22 July 2014 - 03:59 PM
Posted 22 July 2014 - 08:48 PM
Posted 30 July 2014 - 07:58 PM
I fixed that, but still managed to mess it up. I'm just gonna use Git Shell from now on, that other program, the GUI thing, managed to not check for the whole 'MERGE_MODE' thing, and pushed it as a separate commit. Dammit.
Making real good use of my Techie privileges aren't I?
Posted 04 August 2014 - 08:53 AM
If anyone with the right know-how can implement the feature into p2bin.exe, then the build process can be made a bit nicer: Right now, I can't get build.bat to output an error log because every build would be interrupted and stopped because of these warnings.
Posted 04 August 2014 - 07:14 PM