Hi,
I finally got SVN working, but I have changes in 2nd QVW that I want to merge with what's in the repository. I tried manually copying the files from the 2nd -prj directory directly to the SVN controlled -prj directory, but I can't get it to merge.
If I update with Tortoise, the old files I copied are overwritten with what's in the repository. If I select commit, I get a message saying that there's nothing to commit.
Any suggestions to get this done?
