[Okta Webinar] Learn how to a build a cloud-first strategyRegister Now

x
  • Status: Solved
  • Priority: Medium
  • Security: Public
  • Views: 1861
  • Last Modified:

SVN / TortoiseSVN - Do NOT Merge. Overwrite local copy with working copy.

I inadvertently modified a copy of FileX shared with TortoiseSVN.  My assistant, who has been working on the file posted his changes to the SVN Repository.  When I ran an SVN update, SVN reported a conflict on the file.  I don't want to merge the two versions of the file.  I just simply want to overwrite my local copy of the file with the repository version.  How do I do so?
0
jdana
Asked:
jdana
1 Solution
 
sreindl04Commented:
revert the file (select file, right click, TourtioseSVN, Revert..., Select file and press ok)
0

Featured Post

New feature and membership benefit!

New feature! Upgrade and increase expert visibility of your issues with Priority Questions.

Tackle projects and never again get stuck behind a technical roadblock.
Join Now