[
https://issues.apache.org/jira/browse/KYLIN-2018?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15492731#comment-15492731
]
Mat Jaggard commented on KYLIN-2018:
------------------------------------
When I have a conflict that is not easily resolved. I like to open all the
files (with the conflict markers there) in my IDE to resolve the problems.
However I don't seem to be able to find a way to mark all the conflicts as
resolved. At the moment I have to run svn resolve and then for each file, I
open an editor, close it then mark the file as resolved. If I try to mark it as
resolved without opening and closing an editor I get an error message.
> svn resolve should not require edit or merge
> --------------------------------------------
>
> Key: KYLIN-2018
> URL: https://issues.apache.org/jira/browse/KYLIN-2018
> Project: Kylin
> Issue Type: Bug
> Components: Web
> Reporter: Mat Jaggard
> Assignee: Zhong,Jason
>
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
