search

robotics-at-maryland / tortuga

Robotics @ Maryland Autonomous Underwater Vehicle
14 stars 31 forks source link

Merge the vehicle_refactor branch into master #2

Closed jwonders closed 11 years ago

jwonders commented 11 years ago

It has been long enough working from a branch. There is no more need for it now that all of the new controls / vehicle code is in full use.

schristian commented 11 years ago

I'll take care of this. Should all of the software people be working on master after the merge?

jsternberg commented 11 years ago

There are two options for the merge. You can either do it with the svn repo and I can reconvert the repo, or you can do the merge with the git versions (which may end up being easier, I'm unsure. The merging tools are generally easier to use with git).

The software people would then be working out of master and the vehicle_refactor branch would just be deleted.

Has @gsulliva updated the svn repo with the changes from the competition? If he has, I can work on finalizing the git repo with those changes.

schristian commented 11 years ago

No, the competition code is not on the svn repo yet.

gsulliva commented 11 years ago

I'll merge everything over on the svn repos starting tonight.