私の会社では、このように自動マージをオフにして TortoiseSVN を使用しています ( http://tortoisesvn.tigris.org/faq.html#noautomerge )。しかし、リビジョンの範囲(機能ブランチ)をマージしているとき、Tortoise は私の設定にもかかわらず自動マージを行います。更新中、予想どおり、自動マージは正しく失敗します。Tortoise版、Mergeツールのセットアップ、Diffツールのセットアップは別添です。私を助けてください。ありがとう
編集: SVN 設定ファイルの [ヘルパー] セクションを追加
### Section for configuring external helper applications.
[helpers]
### Set editor-cmd to the command used to invoke your text editor.
### This will override the environment variables that Subversion
### examines by default to find this information ($EDITOR,
### et al).
# editor-cmd = editor (vi, emacs, notepad, etc.)
### Set diff-cmd to the absolute path of your 'diff' program.
### This will override the compile-time default, which is to use
### Subversion's internal diff implementation.
# diff-cmd = diff_program (diff, gdiff, etc.)
diff-cmd = "C:\\SVNNoMerge.bat"
diff3-cmd = "C:\\SVNNoMerge.bat"
### Diff-extensions are arguments passed to an external diff
### program or to Subversion's internal diff implementation.
### Set diff-extensions to override the default arguments ('-u').
# diff-extensions = -u -p
### Set diff3-cmd to the absolute path of your 'diff3' program.
### This will override the compile-time default, which is to use
### Subversion's internal diff3 implementation.
# diff3-cmd = diff3_program (diff3, gdiff3, etc.)
### Set diff3-has-program-arg to 'yes' if your 'diff3' program
### accepts the '--diff-program' option.
# diff3-has-program-arg = [yes | no]
### Set merge-tool-cmd to the command used to invoke your external
### merging tool of choice. Subversion will pass 5 arguments to
### the specified command: base theirs mine merged wcfile
# merge-tool-cmd = merge_command