My development team has worked with subversion for quite some time. The way that manage the trunk and branches is as follows:
We (almost) always release from t
First, I wholeheartedly agree with the previous responders that there is no one-size fits all solution.
In our case, we have many relatively small applications, with each application normally having only a single developer. When we do engage in collaborative development, there tends to be only 2 to 4 developers.
Our general policy is:
Andy also made an important point that needs emphasizing: "Proactively teach people how to merge well." Many, if not most of our problems seem to arise from poor merging practices.