All geek questions in one place

Is there any way to check if updating SVN will lead to a conflict?

Before I do svn up, I would like to see what this operation will lead to. In particular, I would like to know in advance if one of my files goes into a conflict state, but also which files have changed. So is there any way to do this?

+3
source share
1 answer

Yes, but not with svn up. You can use this command:

svn merge -–dry-run -r BASE:HEAD
+7
source

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

More articles:


All Articles