I have svnmerge set up to keep two separate branches in sync. Whilst attempting to run a merge I received the following error :

svnmerge: command execution failed (exit code: 1)
svn merge -r 1:1 http://myrepo/svn/projectbranches/source.
Conflict discovered in 'dir/some-file.txt'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: svn: Can't read stdin: End of file found
svn: Error reading spooled REPORT request response

The source of the error is due to a conflict encountered due to the merge. However, due to a new feature in Subversion 1.5, svnmerge is unable to instruct Subversion how to proceed. The new feature is client based and called “Interactive Conflict Resolution”.

To resolve this issue and allow svnmerge to complete, I disabled the new feature. This is done by placing the following line in your Subversion config file:

interactive-conflicts = no

Of course this disables interactive conflict resolution for all further invocations of the Subversion client. So once svnmerge has completed successfully, be sure to set this option back to yes if you’d like to continue using this feature.