On Sun, 21 Apr 2013 09:54:45 AM Michael Vehrs wrote: > After some minor difficulties with git, I have reverted my development > branch to > > b56c15c.
I usually do: git checkout -b <working-branch-name> git reset --hard <commit-hash> to get to a particular commit. > Hopefully, I can figure out what I did wrong. However, I have no > clear idea how to apply changes from that branch to master. "git rebase master"? I admit though sometimes being sufficiently confused that I just fall back to making a patch out of the current changes, and apply them to a new branch based off master. I can see one possibility why doing the fixups in Game might not always work--- we often just update units and or the colony, so some call to updateProductionType in WorkLocation may be necessary in general. However in the simple case of just bringing up the test game and looking at the colony that should not be the case, and a full read of Game is happening in both server and client. Cheers, Mike Pope
signature.asc
Description: This is a digitally signed message part.
------------------------------------------------------------------------------ Precog is a next-generation analytics platform capable of advanced analytics on semi-structured data. The platform includes APIs for building apps and a phenomenal toolset for data science. Developers can use our toolset for easy data analysis & visualization. Get a free account! http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________ Freecol-developers mailing list Freecol-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/freecol-developers
