Ross Gardler wrote: > Ferdinand Soethe wrote: > > >- merge all changes > > You should merge changes from the whole trunk into branch first and then > test. If all goes well you can merge back into trunk. This step is not > required but sometimes it sometimes highlights a change in trunk that > affects your changes in the branch.
I see that Ferdinand and Johannes are doing piecemeal changes to the branch. I reckon that you would do better to follow Ross' advice. Remember that we got into big trouble one time and couldn't later merge to trunk. -David
