Home/ Questions/Q 3403694
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-18T05:17:32+00:00

I’ve some problems committing a rST file like ===== TITLE ===== Chapter ======= Section

  • 0

I’ve some problems committing a rST file like

=====
TITLE
=====

Chapter
=======

Section
-------

blablabla

I got this error:

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.

I found that the problem are the = characters, probably they conflict with diff format, so I substituted all = with _ and now it works, but it it ugly. Why this problem and how to solve it?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    The problem is that string ========= is used in situations when there happens to be a merge conflict. One solution is to play along with pre-commit hook and use something else, like *========= or ===-===-=== (maybe just one space in front of the line would do), or disable that piece of code in the hook (if it’s script). If the hook is an application maybe there is a configuration that you can change to disable this type of check, but I’d go with first option.

    • 0