All geek questions in one place

How can I prevent the use of Tortoise SVN auto-merge?

My project contains several SSIS and SSAS files if there is a conflict and Tortoise SVN silently merges the file, which becomes damaged. We use branching extensively, and when a file merges, it can easily go unnoticed.

How can I prevent this for certain files?

+3
source share
2 answers

Subversion only combines files that either matter svn:mime-typeor one set that text/*. If you set the Subversion property, for example, application/octet-streamit will treat it as a binary and not automatically merge it. This means that you are more likely to get conflicts, i.e. All cases when it is usually automatically combined, now there are conflicts that you must resolve manually.

+4
source

Switching SVN to think the file is a binary will stop SVN from trying to merge it.

Question How do I tell Subversion to process a file as a binary file? describes how to set properties.

0
source

Source: https://habr.com/ru/post/1781993/

More articles:


All Articles