Category: Subversion
-
Updating a Project and Editing Conflicts with TortoiseSVN
In TortoiseSVN, when getting the latest of multiple files, you may that there were conflicts in the merge process. Before you close this window, just scroll up and right click on the file with the conflict. Select “Edit conflicts” and use the Merge tool to resolve them.
-
Compare 2 Local Files with TortoiseSVN
You can compare 2 different files using SVN Diff! Just go into Windows Explorer, select 2 files (ctrl click) and right click on one of them. You’ll get a context menu like this: Just click SVN Diff (or you might see TortoiseSVN > Diff instead). You’ll get a nice side-by-side comparison of the differences in…