Im unable to fix a merge conflict gone wrong

[torbjorn]

Does this issue occur when all extensions are disabled?: Yes/No

• VS Code Version: 1.99.3-1744761595
• OS Version: Ubuntu 24.04.2 LTS

Steps to Reproduce:

1. mess up a git merge conflict
2. observe that you're unable to fix the file with the merge helper enabled

Issue

I ended up with this file after a git rebase and conflict resolution went horrendously wrong:

image: hashicorp/terraform:latest

pipelines:
  default:
    - step:
        name: Terraform Plan
<<<<<<< HEAD
<<<<<<< HEAD
        runs-on:
          - linux
          - self.hosted
=======
>>>>>>> 24edb44 (the pipeline)
=======
        runs-on:
          - linux
          - self.hosted
>>>>>>> 4e76fc3 (removed gitlab)
        script:
          - terraform init
          - terraform validate
          - terraform fmt -check
          - terraform plan
  branches:
    main:
      - step:
          name: Terraform Apply
<<<<<<< HEAD
<<<<<<< HEAD
          runs-on:
            - linux
            - self.hosted
=======
>>>>>>> 24edb44 (the pipeline)
=======
          runs-on:
            - linux
            - self.hosted
>>>>>>> 4e76fc3 (removed gitlab)
          script:
            - terraform init
            - terraform validate
            - terraform apply -auto-approve

When editinf this file in vscode, it looks like this:

I can click those small red arrow/triangles on the side, but the view offered doesnt let me actually edit the file. I just want to remove and/or clean up manually with no intervention from vscode to help me with the conflict annotation. Is that possible, short of disabling the entire thing in settings? (At that point I'd just do it in another editor, (vim/emacs/nano etc)

[lszomoru]

When clicking on the deleted line editor decoration, do you see the "Revert" action in the title of the peek view? Clicking that should allow you to bring back the deleted code. Another option would be to open the merge conflict in the merge editor which should allow you do manually editor the result file.

[torbjorn]

When this happened, I had already (in error) resolved the conflict (using git add). There was a more complex back-story to this, but that was the situation at the time. Not sure how that plays into what capabilities vscode choosed to present to me.

[lszomoru]

In order to me to get to the bottom of this, I would really appreciate if you would be able to provide me steps that I can follow to get to the state that you have described in the issue description. Without that, it's quite difficult for me to progress this issue.

[vs-code-engineering]

This issue has been closed automatically because it needs more information and has not had recent activity. See also our issue reporting guidelines.

Happy Coding!