mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-02-04 23:39:07 +07:00
Explain what to do when conflicts can't be resolved
GitOrigin-RevId: 6ef206a3b9846f1a45b22391dba83652e66b3d0c
This commit is contained in:
committed by
intellij-monorepo-bot
parent
d7972c8e62
commit
369d8f6ed3
@@ -215,6 +215,7 @@ public class SwingUpdaterUI implements UpdaterUI {
|
||||
}
|
||||
else {
|
||||
message += "Some of the conflicts below do not have a solution, so the patch cannot be applied.<br>" +
|
||||
"Please download this version from the developer Web site and reinstall it from scratch.<br>" +
|
||||
"Press '" + CANCEL_BUTTON_TITLE + "' to exit.</html>";
|
||||
}
|
||||
JLabel label = new JLabel(message);
|
||||
|
||||
Reference in New Issue
Block a user