All geek questions in one place

Subversion merge: always replace the file with a new version

when performing a merge, is there any subversion property that I can set to always replace the file with a new workaround (instead of doing diff and raising a conflict when it cannot merge)?

The set of files that I mean are the C # project files (* .csproj). These files always cause a conflict. I would like these files to always be updated depending on which version was newer when I do the merge.

+3
source share
4 answers

Yes.

--accept theirs-full svn merge, , , , , .

EDIT: , , , . SVN FAQ.

+3

, - cproj. , , .. , , ( !), . , , . , Id .

+1

, . svn: ignore, .

# , , . # , - 10-15- , .

0

, svn/tortoisesvn " " . - , . TortoiseSVN , , Tortoise "" , .

0
source

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

More articles:


All Articles