Announcement

Collapse
No announcement yet.

Mark as resolved

Collapse
X
 
  • Filter
  • Time
  • Show
Clear All
new posts

  • Mark as resolved

    I'm trying to use BC4 with TortoiseSVN to resolve a conflict. I set it up according to the help, but once I've removed all conflicts and have saved the file, the file still shows as having conflicts when looking at the folder. I've tried changing TortoiseSVN's merge settings, searching these forums and the Internet for a solution, but haven't found one. I can't see a "mark as resolved" type button in BC4 and tried to find one through the "Toolbar, Shortcuts, Menus" options, but couldn't find one.

    How can I use BC4 to mark conflicts as resolved with TortoiseSVN?

  • #2
    Hello,

    The Resolve step is a separate step in TortoiseSVN. After a merge is complete, you can then "Resolve" it to commit the merge and clean up the extra files.

    There are more details here, in this TortoiseSVN Help doc:
    http://tortoisesvn.net/docs/release/...conflicts.html
    Aaron P Scooter Software

    Comment


    • #3
      Thank you Aaron. I'll do that next time.

      Comment

      Working...
      X