EAP 2019.1 fails to merge svn update conflicts
已回答
there seems to be a problem in prepraing the two conflicting file versions.
请先登录再写评论。
Please report a bug at https://youtrack.jetbrains.com/issues/IDEA and attach the logs (https://intellij-support.jetbrains.com/hc/articles/207241085).
Looks like https://youtrack.jetbrains.com/issue/IDEA-206423