This is what git is for.

When do you plan to remove the commented code?