Can I turn off automatic merging in Subversion?

后端 未结 5 888
不思量自难忘°
不思量自难忘° 2021-02-07 04:37

We\'re looking at moving from a check-out/edit/check-in style of version control system to Subversion, and during the evaluation we discovered that when you perform an Update ac

5条回答
  •  渐次进展
    2021-02-07 05:01

    It's in the FAQ: How can I prevent Subversion from doing automatic merges?

    1. In TortoiseSVN->Settings->General->Subversion configuration file, click on the edit button.
    2. Change the [helpers] section by adding

        diff-cmd = "C:\\false.bat"
      

      (note the double backslash)

    3. Create the file C:\false.bat which contains two lines

        @type %9
        @exit 1
      

提交回复
热议问题