Mergetool says "the buttons above", but what does that mean?

[JEP]

I'm a little confused by the "Resolve it by clicking the buttons above" wording below:

Which "buttons" is it referring to?

[JEP]

Okay, I think I figured this out (it was almost guaranteed I would if I posted about it). Apparently these are the "buttons":

Correct me if I'm wrong. I will say that they really didn't stand out as "buttons" for me at all.

[calbzam]

Hi @JEP,

You mean that it's not clear enough in the mergetool what are the buttons, right? I can share with the team if we can somehow make it more visible.

Regards,

Carlos.

[JEP]

Yeah, that's my opnion. They don't look like any normal buttons, just titles. Either they should look more button-like, or the message should be reworded to make it clear what it's referring to "by clicking on the Deselect buttons".

[Oyvind]

I was also confused when using Plastic's built-in merge tool first time around, didn't realize that the buttons existed the first time I tried the tool.

Went as far as deciding to try and replace the built-in tool with what I was familiar with from Git, but after having issues with resolving the parameter values, I ended up going back to try the built-in one again and only then I figured out that there were actual buttons.

My impression was the same as JEP in that I thought the fields were just titles