Merge editor is always dirty

[mjbvz]

Testing #150389

1. Open merge editor

Bug
For me, the merge editor tab is always dirty

From the test plan item description, I believe it should only become dirty when you edit the result

[hediet]

This is dirty, as conflict-markers are removed automatically. You can undo that.

[vscodenpa]

The described behavior is how it is expected to work. If you disagree, please explain what is expected and what is not in more detail. See also our issue reporting guidelines.

Happy Coding!

[mjbvz]

I think this was also fixed in the latest insiders too. Opening the file no longer shows it as dirty for me

Actually still happening, I just had saved the the file without markers at some point

Potentially also mentioned in: #151033 (comment)

The main thing I run into is that because the editor is dirty, closing it triggers a modal that asks me to save the file. I often am just peeking at the conflicts so don't want to save anything yet

[bpasero]

👍 , same feelings. Instead of removing the merge markers, maybe we can hide them in some clever way so that they are not in the way when accepting one of the changes.

[jrieken]

The main thing I run into is that because the editor is dirty, closing it triggers a modal that asks me to save the file. I often am just peeking at the conflicts so don't want to save anything yet

With #153341 we are improving that a little bit when auto-save: off - you'll see an option to discard changes (don't save). Tho, for auto-save: on it isn't better, there is a discussion to disable auto-save for "under merge" models

[jrieken]

See #152841 (comment) - there will be an option to discard merge changes, basically restoring the initial state with the merge markers. Closing this issue as mostly duplicated by #152841