Hi svn developers,

once I tried to commit txt file with these two lines:

RUNNING:
=======

written inside, I got following error message:


[tjavurek@lxplus0057]~/pMSSM/BooFactory/Tools2% svn ci -m
"" error.txt
Sending        error.txt
Transmitting file data .svn: Commit failed (details
follow):
svn: Commit blocked by pre-commit hook (exit code 1) with
output:
Some parts of your commit look suspiciously like merge
conflict markers.  Please double-check your diff and try
committing again.

Best, Tomas.

  • svn bug Tomas Javurek

Reply via email to