We use Subversion to manage our project files, including the seam managed message bundles which have the highest mutation rate of the whole project.
Ever so often a developer reads past a line during diff merge and accidentally reverts some changes, which usually slips through the testing process.
What practices have you adopted to ensure bundle integrity?