Update in web server

[TimSchofield]

The trick is to use git or one of the other modern version control systems such as mercurial.

Keep the master branch in sync with the main line on sourceforge using git-svn or equivalent. Create a branch that is the master branch plus your changes, and then whenever the master branch is updated merge that up into your customised branch.

Modern version control systems (not cvs or subversion) are very smart at merging, and I hardly ever see any conflicts, and when I do they are easily resolved. What is important is to do the above process regularly.

Tim