Right, features is not perfect. Upgrading a feature from D6 to D7 has been a pain to me. I've merged features together and it was not as hard, at the end it is

Right, features is not perfect. Upgrading a feature from D6 to D7 has been a pain to me. I've merged features together and it was not as hard, at the end it is all code, you just need to be very careful, but at the same time you have git to revert if something goes wrong. I don't understand the part about committing just one feature. You can commit just one =P.