Those of you on the koha-cvs list may have noticed I've been attempting to merge the rel-1-2 branch back into the main branch. Some points to ponder: 1. Branching is necessary 2. Branching makes things difficult Some things to keep in mind when working on a branch: 1. Don't make any changes in the branch that could be made in the main and merged over to the branch. The goal is to keep the number of files that are different between a branch and the main as small as possible. If you are fixing a spelling mistake in a comment or some other cosmetic change, make the change in the main and merge the file into your branch. 2. Try to restrict development in a branch to a small number of files. It is easier to merge back into the main if the modified files are restricted to, for example, only circulation files. Steve Tonnesen