svn - What is the best way to resolve a tree conflict with TortoiseSVN if I want to keep my local changes? -
i've been unfortunate enough run lot of tree conflicts myself lately on project i'm working on. want know best , simplest way resolve tree conflict if want keep local changes only. thank you.
right-click on file > edit conflicts > mark resolved.
Comments
Post a Comment