Prompt shows when pressing "accept merge"

[connor4312]

Testing #151024

make sure the message doesn't show when pressing 'Accept'

This doesn't appear to work for me, I get the confirmation prompt both with autosave on and off:

Kapture.2022-06-28.at.15.38.48.mp4

[jrieken]

This is a duplicate. Unfortunately, I don't recall the exact issue number nor its title 😳 Anyways, searching for issues with the same labels will likely help you 👉
https://github.com/microsoft/vscode/issues?utf8=✓&q=is%3Aopen+label%3Amerge-editor

[jrieken]

#153492

[vscodenpa]

Thanks for creating this issue! We figured it's covering the same as another one we already have. Thus, we closed this one as a duplicate. You can search for similar existing issues. See also our issue reporting guidelines.

Happy Coding!

[jrieken]

I have fixed #153492 but the dialog still shows - despite the pressing Accept Merge. There is technical challenges but I can also sell this as feature: When pressing accept in the presence of conflicts you get a prompt.

@connor4312 How does that sound? Do you agree with marking this as-designed?

[connor4312]

🤷 I can see that working, we can see if we get feedback on it whether it's confusing for users.

[connor4312]

Gah, Github changing their cmd+enter keybinding has caught me five times already today 😠