The editing timeline basically looks like this:
- Work on browser version, add new features, test, etc. Doing this in the browser allows me to work much more efficiently than compiling and testing in Xcode each time.
- End of week port entire thing to iOS framework, deploy to iPhone
- That day fix any problems in iOS port, try to consolidate code between the two as much as possible. This results in tweaks being done in both codebases and copies/pasted between each other that day
- Continue working on browser version until next port
I'm not a Git expert and am just not sure what the best way is to go about this. Right now I mostly use it for keeping a main working version of the game in one branch and merging the development branch into it when experimental stuff gets finalised. Fiddling with two sets of code on these porting days is getting confusing and I'm finding myself making mistakes, plus wasting tons of time. Can anyone advise how one might manage this kind of thing better?
Edited by Drakonka, 11 October 2012 - 04:40 AM.