From: Stefan F. <ste...@we...> - 2014-08-16 14:40:38
|
Sorry 1880_A is the exception currently, as 1880 still requires some work currently. ;-) On 08/16/2014 04:32 PM, Michael Alexander wrote: > I'm seeing diffs in the 1880_A test game. > > For example, the last 5 lines are: > EoGFinalRanking : > 1. 6213 Dirk Steiner > 2. 5867 Karsten Ockenfels > 3. 4015 Martin Brumm > 4. 3032 Volker Schnell > > vs. > > EoGFinalRanking : > 1. 4883 Dirk Steiner > 2. 4077 Karsten Ockenfels > 3. 2570 Martin Brumm > 4. 1922 Volker Schnell > > Is that expected at this point? > > > On Fri, Aug 15, 2014 at 5:26 AM, Stefan Frey <ste...@we... > <mailto:ste...@we...>> wrote: > > Great that you got the explicit permission. > > When to merge with rails_2_develop mainly depends on your preferences. > > I am only asking for the following: > Please rebase or merge your branch with rails_2_develop so that you > are able to fast forward your changes into rails_2_develop. > > And before doing so, please make sure that it still compiles and > runs all save file tests. > > Main advantage merging frequently is that your development work will > be included in the alpha releases. You could even ask for a alpha > release after you added some functionality. The build itself is > nearly hundred percent automated. > > I am looking forward to see your progress. > > Stefan > > > > > > > Michael Alexander <out...@gm... > <mailto:out...@gm...>>schrieb: > > I did get permission from the author to put it into Rails. > > I have most of the Parliament Rounds working. (Nothing yet with > the stock market or map). > > This work is being done within the "mal_1862" branch. Later > today I'm going to re-pull from"rails_2_develop" so I can pick > up changes that have gone into there. > > Should I on some periodic basis push my changes up into > "rails_2_develop", or should I be waiting until I have a lot > more working? > > Mike > > > ------------------------------------------------------------------------------ > _______________________________________________ Rails-devel > mailing list Rai...@li... > <mailto:Rai...@li...>https://lists.sourceforge.net/lists/listinfo/rails-devel > <https://lists.sourceforge.net/lists/listinfo/rails-devel> > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Rails-devel mailing list > Rai...@li... > <mailto:Rai...@li...> > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > ------------------------------------------------------------------------------ > > > > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |