Hi Thorsten, On 09/27/2013 07:07 PM, Thorsten Lajewski wrote:
concerning the feature branch display_menu_structure, we should test it with the hardware of our last robot, so if everything works, we can test it on Tuesday and include it in the release.
I know. Bit I do not know if we will be able to fully test tour code on Tuesday. Since the branch is going to be handed over to a knew maintainer I'd prefer if we did not include it with the 2013 release. As we agreed last Tuesday, this branch will not be a blocker since it is not required for any of our last seasons code.
Concerning my tcpip branch, i will need some more time, so we can probably include it in the next release, which should be a minor release, because we will use it for the robot simulator as soon as it is working.
I think we will be compiling this season's code against the `develop` branch. Next summer the new code will be tested an we can release again. So just merge your tcp/ip branch into develop as soon as you are done. Since feature/experimental_structure will become the new develop we need to rebase your branch on top of it soon. But there is no hurry. Just tell we when you have time after the release and we can rebase the stuff "together" via Jabber. Kevin