Hi Experts, After merging my branch line to mainline I encounter merge conflict on my mlsource files. Do you have any idea how to resolve this without using tortoise svn? Regards, Dale
asked
Dale Dela Cruz
1 answers
0
Resolving it without TortoiseSVN is likely not an option, is there a particular reason you want to resolve it without?