Skip to content

Do not format merge conflict markers #97

@iBicha

Description

@iBicha
<<<<<<< HEAD
        var1 = 1
=======
        var2 = 2
>>>>>>> main

formats into

        <<<<<< < HEAD
        var1 = 1
        = = = = = = =
        var2 = 2
        >>>>>> > main

This is particularly annoying if you have format on save in vs code and try to modify things and save

Metadata

Metadata

Assignees

No one assigned

    Labels

    bugSomething isn't working

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions