views:

37

answers:

1

Hi,
I am maintaining a large website with many new features every day.
We don't have a clear road map of development features ( Don't ask y /-: ).
My problem is that every 2 days we need to update the production environment with small features and it is a must thing.

In parallel to that, in the same site we have also a development of large features that its development time can be a week and more.

What is the best way to manage that?
I want to be able to provide small features with large features within the same site, even the same files.

Thanks

+2  A: 

Develop the large features in independent branches.

The small changes can (presumably) be performed on the repo as normal, then the development branches merged in upon completion.

RJFalconer