Git seems appropriate for an FRC type of revision system at competition. My personal preference would be to still have a central server back at the school (or wherever) and use a tethered smart phone to access it. In a couple of years, I suspect a cheap 3G wireless plan for the laptop/netbook will be available too.
Quote:
Originally Posted by Boydean
Switch to Git. Your dreams will come true, and nightmares of merging will disappear.
|
Be careful in your presumptions here; there is no silver bullet for merging. Take company with 30+ programmers all touching a 500k+ SLOC code base (common for any sort of bleeding-edge company that reuses software to create new products) and the nightmares will commence, regardless of what repository system is used. Over time, features are added/removed and code methods are refactored, renamed, or removed. This is especially apparent when a branch splits and a bug fix or feature is done in one branch, only to be discovered later that the other branch implemented the fix/feature in a different way and a merge isn't possible with a large time investment. Again, this is for larger software systems.