From: Stefan F. <ste...@we...> - 2014-01-30 09:09:47
|
I am always surprised how easy it is to underestimate the amount of work required for a merge of two feature branches. ;-) Even in those cases there it is pretty straight forward as it is here, a total of 208 merge conflicts, 75 errors after merging and 15 errors which require some rewrite remain.<br> <br> The good thing here I can take my time and so I want to let you know that you still have to wait a little bit for the alpha release.<br> <br> However working on rails_2_develop is possible, as all substantial changes to Rails core are already included.<br> Only working on the UI of the Operating Round or the network algorithms is not a good idea until the tile laying is fully merged.<br> |