Cannot click on conflicts in the first file of a commit

[plichard]

Version

0.14.3

Operating System

Linux

Distribution Method

AppImage (Linux)

Describe the issue

Clicking on the first conflicted file in a commit just closes the commit details instead of opening the conflict handling ui.

conflict.mp4

How to reproduce

No response

Expected behavior

No response

Relevant log output

No response

[Byron]

Thanks a lot for reporting!

I noticed this behaviour as well and thought it should show the conflict itself, or inform me how to Resolve Conflicts.
Conflict resolution is already possible, but only after the respective button was pressed.

CC @PavelLaptev as seems to be mostly a UX question.

[plichard]

Oh! Right, this has nothing to do with it being the first file in the commit listing, for some reason the "Resolve conflicts" button is often just invisible to my brain, you mentioning it revealed it 😅 .
I forgot conflict resolution worked for me previously because I actually clicked "Resolve conflicts" first, and then I was able to select one of the files (which was not the first one at the time).

This report must have been a confusing read ...

But yes, big +1 for showing the conflicts anyway when clicking on the affected file.

[Byron]

Oh! Right, this has nothing to do with it being the first file in the commit listing, for some reason the "Resolve conflicts" button is often just invisible to my brain, you mentioning it revealed it 😅 .

This is super-interesting! I noticed that too, and magically, after #5722 was done, this issue disappeared for me.
Could you find an occasion where this happens in the latest stable, and then try a nightly build? Maybe that issue goes away.

Then what stays here is the UX issue that people right now are visually trained that something happens once they click a file. Maybe while that's not the case, these conflicted files could be presented differently. CC @PavelLaptev .

[PavelLaptev]

@Byron I agree with you and @plichard. We should be able to at least preview the file when we click on it. I'll create a PR.

For the next iteration, we can also think about additional ways to go to the conflict resolution page.

[Caleb-T-Owens]

We currently don't load that file data. It might take some work to get a file display working.

We'd need to generate the files with conflicts written in them for display, and to have consider how to display the cases where you've modified and they've deleted

[PavelLaptev]

@Caleb-T-Owens got it. I thought it's only a frontend thing, just a svelte condition that prevent to click on a conflicted file row.

[Caleb-T-Owens]

I wonder if we could have them do a little red wiggle and have a toast or little message appear, just so the user knows why they are not clickable?

[PavelLaptev]

@Caleb-T-Owens yes, let me think about this. But it's a good idea for a quick workaround.

[Byron]

My intuition here was that conflicting files should be displayed in a way that makes clear they aren't clickable in the first place, by being visually different enough from normal files. Something I also repeatedly tried to do is to mouse-over the conflict-icon, to learn what that should mean, but nothing happened.

[PavelLaptev]

When you click on a conflicted file, what if we display the warning in the same way we show files? The warning text would appear alongside a button to open conflict resolution mode.

We are already doing something similar for large files:

[Byron]

That would make sense to me, and it appears to be consistent as well with what users expect. The comparison to how large files are handled makes that clear.

[Caleb-T-Owens]

I like the look of that

[PavelLaptev]

Cool! @Caleb-T-Owens, could you please help me with this? I'm struggling to figure out how to open FileDiff for conflicted files. Currently, we open the FileDiff if there’s a file in selectedFileIds, but conflictedFiles are not the same as displayedFiles, so I can’t just pass it to selectFilesInList.