feat(vcs): make unresolved merge conflicts visible wherever they come from (#905)

Conflicts left by stash pop or an automatic stash now get the same editor banner (File has unresolved merge conflicts, Resolve conflicts…) as merge conflicts. Complete conflict markers are reported as errors in every language and listed in Problems (severity under Settings › Editor › Inspections › Version Control). The toolbar shows Resolve/Continue and Abort next to the branch while conflicts or an interrupted operation exist, and the Commit view and Branches popup offer Resolve Conflicts even when no operation is in progress.

Co-authored-by: ntbang0901 <[email protected]>

src/ui/expui/vcs/abort.svg

@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.14645 13.1464C1.95118 13.3417 1.95118 13.6583 2.14645 13.8536C2.34171 14.0488 2.65829 14.0488 2.85355 13.8536L8 8.70711L13.1466 13.8537C13.3418 14.0489 13.6584 14.0489 13.8537 13.8537C14.0489 13.6584 14.0489 13.3418 13.8537 13.1466L8.70711 8L13.8536 2.85355C14.0488 2.65829 14.0488 2.34171 13.8536 2.14645C13.6583 1.95118 13.3417 1.95118 13.1464 2.14645L8 7.29289L2.85367 2.14657C2.65841 1.95131 2.34183 1.95131 2.14657 2.14657C1.95131 2.34183 1.95131 2.65841 2.14657 2.85367L7.29289 8L2.14645 13.1464Z" fill="#6C707E"/>
+</svg>

src/ui/expui/vcs/abort_dark.svg

@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.14645 13.1464C1.95118 13.3417 1.95118 13.6583 2.14645 13.8536C2.34171 14.0488 2.65829 14.0488 2.85355 13.8536L8 8.70711L13.1466 13.8537C13.3418 14.0489 13.6584 14.0489 13.8537 13.8537C14.0489 13.6584 14.0489 13.3418 13.8537 13.1466L8.70711 8L13.8536 2.85355C14.0488 2.65829 14.0488 2.34171 13.8536 2.14645C13.6583 1.95118 13.3417 1.95118 13.1464 2.14645L8 7.29289L2.85367 2.14657C2.65841 1.95131 2.34183 1.95131 2.14657 2.14657C1.95131 2.34183 1.95131 2.65841 2.14657 2.85367L7.29289 8L2.14645 13.1464Z" fill="#CED0D6"/>
+</svg>

src/ui/expui/vcs/resolveContinue.svg

@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.5 12.5L13 8L8.5 3.5M3.5 12.5L8 8L3.5 3.5" stroke="#6C707E" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

src/ui/expui/vcs/resolveContinue_dark.svg

@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.5 12.5L13 8L8.5 3.5M3.5 12.5L8 8L3.5 3.5" stroke="#CED0D6" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

src/ui/icons.tsx

@@ -400,6 +400,8 @@ const ICONS = {
   library: "nodes/library",
   // VCS
   commit: "vcs/commit",
+  "resolve-continue": "vcs/resolveContinue",
+  "vcs-abort": "vcs/abort",
   branch: "general/vcs",
   "git-pull": "vcs/update",
   "git-push": "vcs/push",