Improve Merge Editor Story For Files Having/Getting Conflict Markers

[joaomoreno]

[jrieken]

My plan is to use the existing merge-conflict extension to add a (strong) button or other UI element to re-open the file in the merge editor.

[hediet]

Related

• Use editor banner to advertise merge editor when in editor with git conflicts #151403

[lszomoru]

@hediet, I believe that this can also be closed as a duplicate, no?

[hediet]

This is not a duplicate, as this is about opening the 3 way merge editor from the decorations.

[jrieken]

This is how it looks with #158377 (draft)

Screen.Recording.2022-08-17.at.16.23.24.mov

@misolori @daviddossett This is a bit UI questionable - I am using a command with a label only (no icon) so that it stands out more... Maybe we find a prominent (colored?) icon instead or maybe we think about prominent actions in general (similar to the default command effort, tho this is more complex)

[miguelsolorio]

Didn't we previously have an option in the codelens to open the merge editor or did that not get added?

[jrieken]

No, that didn't get added. We have the "normal/old" lenses to resolve individual conflicts but @hediet and I weren't sold on the idea of repeating a "open in merge editor"-command there. Code lens should be contextual and not global commands.

[miguelsolorio]

Tried this out today and it definitely feels strange with just the label, I think an icon might help it go a long way:

[daviddossett]

👍 for using an icon to at least be consistent with other icon buttons w/ labels (e.g. notebooks toolbar). Originally we had this icon along to toggle between the raw file and merge editor views. Could use it with this new label too. git-merge felt out of place as an icon choice to my eyes.

[jrieken]

Text and icon is surprisingly hard because we always default to the icon (when there is one). This coming from an extension makes life event harder. The challenge (and reason for using text) is that we want something that grabs attention. @daviddossett @misolori how about a prominent, colored icon? Or maybe the notion of a default/prominent button, or ultimately use the "blue" in-editor button? Like so

[daviddossett]

or ultimately use the "blue" in-editor button

This was my next idea too. I like this since even with text I'm not sure I'd always notice the button in the toolbar.

I do think it would be interesting to explore the notion of a single prominent action in the editor toolbar for use beyond just this scenario. Another example: I think the Python extension uses a green "run" icon but I recall that being hard for users to spot. I'll create an issue to explore this as a general pattern.

[jrieken]

Re-opening and fixing this with the "blue button"

[jrieken]

The blue button feels more natural. This is what I'll be PR'ing

Screen.Recording.2022-08-22.at.12.14.30.mov

[gjsjohnmurray]

Looks good but is there a risk that if I accidentally click twice, slowly, over "Open in Merge Editor" I'll inadvertently trigger "Accept Merge" on the merge editor?

[jrieken]

Looks good but is there a risk that if I accidentally click twice,

🤷 don't click twice? I see the risk but it's also not unique to this UX but possible with any button that causes an in-place change

[IllusionMH]

@jrieken is there a chance to hide/disable Accept Merge button for couple of seconds after switch?

[jrieken]

To verify (see #153800 (comment))

• open a file
• cause a merge conflict in that file
• make sure the blue button with "Open in Merge Editor" shows

[hediet]

🤷 don't click twice?

Actually it happens to me from time to time that I accidentally double-click, especially after the gym and with a sensitive mouse ;)

[daviddossett]

After using this for a few days I think I actually preferred the toolbar option. Opened #159195 to explore this further as a general pattern.

[vai0]

also finding it a bit annoying there's a big blue "Open in Merge Editor" button when I already know about it, and prefer not to use it.