I got that very error with TortoiseSVN under Windows. Apparently, the .svn folder has a small SQLite database file, which, if you don’t have write access to, will cause that error. As I was using TortoiseSVN through the windows shell (the right-click) menu, to work around it I ran the windows explorer I used to … Read more
TortoiseGit has been rewritten in the same style as TortoiseSVN, it looks like some additions and some changes from the outside. It depends more on asking the question if Git is as goot as SVN. Seems they finished porting TortoiseGit, when I last tried it it was around 60% ported. I know that each thing … Read more
In your case: Switch the working copy to the trunk (SVN Switch) Merge the branch into the working copy (SVN Merge) Make sure everything still compiles and works Commit the working copy (the trunk) Consider killing the branch In a team environment I would suggest that you first merge the latest modifications from the trunk … Read more
Found by Google how to fix it: press F5 in the commit window (not in the “warning popup”) See http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2831045 for details. On 26.08.2011 22:39, Ryan J Ollos wrote: For several months now I’ve been seeing the following dialog box appear when initiating Commit. It frequently happens when attempting to commit following a merge. The … Read more
As in current recommended answer mentioned, you need to sort the entries of the overlay identifiers in the registry. I haven’t deleted those OneDrive or GoogleDrive entries but renamed all Tortoise Folders by adding 3 spaces to bring them on top. Just restart and even with Tortoise SVN client 1.7.9 you’ll see your SVN overlay … Read more