SVN: Resolve Tree Conflicts
What ever happened to this fine feature? I can't find it anywhere.
http://blogs.jetbrains.com/idea/tag/subversion-16/
Please sign in to leave a comment.
What ever happened to this fine feature? I can't find it anywhere.
http://blogs.jetbrains.com/idea/tag/subversion-16/
Please sign in to leave a comment.
This feature is about showing tree conflicts in Changes | Local, if you have any
I do see tree conflicts (they show up as a red box), but I don't see any way to resolve them from the drop down box. The blog entry mentions "Mark Tree Conflict Resolved".
It is not implemented jet.
You can mark them as resolved from IDEA, when you're done with resolving, from this context menu
where does it show --> the reason why this has marked as tree conflict?