4 comments
Comment actions Permalink

This feature is about showing tree conflicts in Changes | Local, if you have any

0
Comment actions Permalink

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".

0
Comment actions Permalink

It is not implemented jet.
You can mark them as resolved from IDEA, when you're done with resolving, from this context menu

0
Comment actions Permalink

where does it show --> the reason why this has marked as tree conflict?

0

Please sign in to leave a comment.