test: add test for failing merge conflict resolution
test: add test for failing merge conflict resolution

lint-staged loses the MERGE_HEAD while stashing backups, so the current behaviour breaks merge conflict resolution. Solution is to manually check, save, and restore the MERGE_HEAD during runtime. This should be fixed and the test adjusted for successful run

okonet/lint-staged,okonet/lint-staged