Results 1 to 2 of 2
  1. #1
    Join Date
    Mar 2015
    Location
    Montréal, Québec
    Posts
    4

    Default TortoiseSVN not recognizing Merge result

    Since one or two BC4 updates ago, TortoiseSVN on Windows stopped recognizing the merge output when resolving an Update conflict.

    Previous BC4 versions worked just fine. I guess something changed, nor do I know how TortoiseSVN detetcs the newer merged output.

    For the moment, I have to save the merge output as normal, then on Tortoise right-click on Mark As Resolved; previously I didn't need to do this.

    Thanks, have a nice day,
    Humberto

  2. #2
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,916

    Default

    Thanks for posting. BC4 does not intentionally support marking as resolved automatically, in 4.0.0 or later versions, but is something we can look into. Were you using the workaround found in this forum thread?
    http://www.scootersoftware.com/vbull...VN-integration

    How do you currently have TortoiseSVN configured to use BC4 as the difftool and mergetool?
    Aaron P Scooter Software

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •