your edits will be there, in case the svn cannot find the update lines, that file will be marked as conflicted, and you have to edit that manually or by any diff merging tool.LOL. Up to now, there's something I can't still understand with SVN update, say I already have my ready made Hercules, and once I update, are all my changes automatically overwritten by updates?
Yes, TortoiseSVN should show the reports.Wow, so SVN check the content of each files line by line?
Will there be a report after SVN update on which files tortoise SVN found those conflicts?
Thanks!
We use essential cookies to make this site work, and optional cookies to enhance your experience.