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

Posted on 2009-04-18
Last Modified: 2013-11-25
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?
Question by:jdana
    1 Comment
    LVL 3

    Accepted Solution

    revert the file (select file, right click, TourtioseSVN, Revert..., Select file and press ok)

    Featured Post

    6 Surprising Benefits of Threat Intelligence

    All sorts of threat intelligence is available on the web. Intelligence you can learn from, and use to anticipate and prepare for future attacks.

    Join & Write a Comment

    When working in a large software development team, whether you have many developers working on the same projects, or your project is linked to other projects; it is very important that developers regularly perform "get latest" to ensure that the cha…
    Article by: gr8gonzo
    Git can be a complicated version control system for beginners, but it definitely is one of the best ones out there. Since this article assumes that you're starting at square one, it will skip over things that Git -can- do and will focus on the typic…
    To add imagery to an HTML email signature, you have two options available to you. You can either add a logo/image by embedding it directly into the signature or hosting it externally and linking to it. The vast majority of email clients display l…
    Get a first impression of how PRTG looks and learn how it works.   This video is a short introduction to PRTG, as an initial overview or as a quick start for new PRTG users.

    733 members asked questions and received personalized solutions in the past 7 days.

    Join the community of 500,000 technology professionals and ask your questions.

    Join & Ask a Question

    Need Help in Real-Time?

    Connect with top rated Experts

    19 Experts available now in Live!

    Get 1:1 Help Now