changelog

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.6.43]
+- When discarding a file change fails because of resolved conflicts (e.g. during merge) prompt to checkout our stage,
+their stage or to leave conflicts for manual resolving. @tzemanovic (Tomas Zemanovic)
+
 ## [0.6.41]
 - Truncate large behind-upstream list to fix issue (#255) where the extension would grind to a halt. (@bjackman
 Brendan Jackman)

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "magit",
-  "version": "0.6.42",
+  "version": "0.6.43",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "magit",
-      "version": "0.6.42",
+      "version": "0.6.43",
       "license": "MIT",
       "dependencies": {
         "@vscode/iconv-lite-umd": "^0.7.0",

package.json

@@ -7,7 +7,7 @@
   "author": {
     "name": "Kristian Andersen Hole"
   },
-  "version": "0.6.42",
+  "version": "0.6.43",
   "engines": {
     "vscode": "^1.50.0"
   },