From: Stefan F. <ste...@we...> - 2014-08-15 09:26:40
|
<html> <head> </head> <body>Great that you got the explicit permission.<br> <br> When to merge with rails_2_develop mainly depends on your preferences. <br> <br> I am only asking for the following: <br> Please rebase or merge your branch with rails_2_develop so that you are able to fast forward your changes into rails_2_develop. <br> <br> And before doing so, please make sure that it still compiles and runs all save file tests. <br> <br> 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. <br> <br> I am looking forward to see your progress.<br> <br> Stefan<br> <br> <br> <br><br><div class="gmail_quote"><br> <br> Michael Alexander <out...@gm...>schrieb:<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"> <div> <div> I did get permission from the author to put it into Rails. </div> <div> <br/> </div> I have most of the Parliament Rounds working. (Nothing yet with the stock market or map). <div> <br/> </div> <div> 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. </div> <div> <br/> </div> <div> 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? </div> <div> <br/> </div> <div> Mike <br/> <div> <br/> </div> <div> <br/> </div> </div> </div> ------------------------------------------------------------------------------ _______________________________________________ Rails-devel mailing list Rai...@li...<a href="https://lists.sourceforge.net/lists/listinfo/rails-devel" target="_blank"> https://lists.sourceforge.net/lists/listinfo/rails-devel</a> </blockquote></div></body> </html> |