Basically don't have long lived branches. Everyone should know that by now, doesn't matter what development model or process you are using, if you've gone off

Basically don't have long lived branches. Everyone should know that by now, doesn't matter what development model or process you are using, if you've gone off on a branch for too long you will have problems.