Subversion Repository Hook : detect-merge-conflicts

Description:

This Pre-Commit hook can be used to detect changes that look like forgotten conflict markers. If the forgotten conflict markers are found the commit is aborted.

Installation:

These instructions assume that you are using the subversion command line interface on a Unix system. Your process may be slightly different depending on client and operating system.

• Check out your /rice-config repository folder

svn co https://svn.rice.edu/r/REPONAME/rice_config

• Change to the rice_config folder

cd rice_config/

• Create a folder called hooks if it doesn't exist already

mkdir hooks/

• Change into the hooks folder

cd hooks/

• Create a file called detect-merge-conflicts

touch detect-merge-conflicts

• Add the directory and file to the repository

cd ../../
svn add hooks
svn commit -m "Added detect-merge-conflicts hook to the repository"

Configuration

No configuration is required for this hook. Merely adding the empty file will enable the hook.