CODEWITHSUNDEEP
svn
René Nyffenegger
René Nyffenegger

Reputation: 40499

Is there a possibility to check if an SVN update would result in a conflict?

Before I do an svn up, I'd like to see in what that operation would result. Specifically, I would want to know in advance if one of my files would go into a conflicted state, but also, which files have changed. So, is there a possibility to do that?

Upvotes: 3

Views: 463

Answers (1)

Anton Gogolev
Anton Gogolev

Reputation: 115691

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

svn merge -–dry-run -r BASE:HEAD

Upvotes: 6

Related Questions