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 ?
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 ?
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