2 comments
Comment actions Permalink

This is a read-only view of conflicted changes.

To resolve conflict you can invoke corresponding action ("Git -> Resolve Conflicts", "HG -> Run Conflict Resolver", "SVN -> Resolve Text Conflict", ...)

0
Comment actions Permalink

You're right. Thanks!.

0

Please sign in to leave a comment.