Resolve SVN Conflict

94 views Asked by At

We are taking svn update through command line in Final Builder. Sometimes svn gets conflict in source. We need resolve this conflict.

How to resolve this svn Conflict using the final builder or command prompt ?

1

There are 1 answers

2
Niranjan Gattupalli On

TortoiseSVN is a very handy tool for COnflict resolution which gives you a good UI to compare the source Pls. read that info here : https://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-dug-conflicts.html