It seems that something has changed internally in vscode in part of handling git scm related operations -- so now vscode does send
new type code of value 17.
Using meld ext along with win/wsl/remote configs of vscode.
Below is the patch I have crafted asap and tested -- it is working fine and as expected.
diff --git a/src/extension.ts b/src/extension.ts
index 1e42174..b89a927 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -537,6 +537,7 @@ export function activate(context: vscode.ExtensionContext) {
break;
case 16: // merge conflicts
+ case 17: // new type of conflict
// get content of head version of the selected file
runGit(selectedFile, ":2:./", "current", (head, err) => {
if (err) {