Jump to content

Leaderboard

Popular Content

Showing content with the highest reputation on 06/21/2011 in all areas

  1. These files are a product of merge conflict. For binary files (which VIs are), you get rid of them in SVN approved way: If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version. Br, Mike
    1 point
  2. Here is my proposition. Inspired by recent LAVA activity... However I haven't read that all And alternative version for the front, which is even more pure:
    1 point
×
×
  • Create New...

Important Information

By using this site, you agree to our Terms of Use.