Skip to content

Conversation

DarkDefender
Copy link

Before, you couldn't easily see the commit hash authors or message when resolving file conflicts. Now you can hover over the hashes to get a tooltip with a bit more information.

I have to admit that this is my first time working with C# and Avalonia, so I'm not sure how hacky my solution is... 😅

@love-linger love-linger self-assigned this Mar 7, 2025
@love-linger love-linger added the not-planned It's not planned in the future label Mar 7, 2025
@love-linger
Copy link
Collaborator

  • First, we already shows the tooltip in In-Progress Bar
    image

  • It's better to supports to navigate to selected commit just like another well-known GIT client Fork

@DarkDefender
Copy link
Author

DarkDefender commented Mar 7, 2025

It's better to supports to navigate to selected commit just like another well-known GIT client Fork

I agree! I see you already added it as well! Thanks!

First, we already shows the tooltip in In-Progress Bar

Ah, I missed that!
Wouldn't it be good to show tooltips when hovering over the commit hashes in the conflict area as well though?

Feels weird to me that you can click on them now but not hover over them (like you can for the parent hash in the commit information view).

To me, when I see orange text, I assume that I can hover over them for tooltips as that seems to be the design language used here. IE: If orange, you can hover for more information. If orange and underline, you can also click on it to navigate.

@DarkDefender
Copy link
Author

One of the reasons I added the hover tooltop is because the In-Progress Bar doesn't show up for stash conflicts.
I have a change for making for info show up about stashed changes here: #1067

Even if there was a In-Progress Bar for stash conflicts, I would still like to also be able to hover over the hashes in the conflict view. I just wanted to add a bit more context to why I created this PR.

Now you cna hover over the commit hash to see a tooltip like you can
for the parent hash in the commit information window
@DarkDefender DarkDefender force-pushed the show_conflict_hash_tooltip branch from e1a63f2 to 09309ce Compare March 10, 2025 10:17
@DarkDefender
Copy link
Author

DarkDefender commented Mar 10, 2025

I've cleaned up my changes to be much more simpler like in your changes! Thanks for showing me how it is done. :)

With your "click to navigate to sha" changes, now the hashes work just like in the "commit message" window.

@love-linger
Copy link
Collaborator

I've pushed my implementation for this feature. Because of some commits already exist in SourceGit.ViewModels.Conflict, it not necessary to fetch them on first-time-hover.

@DarkDefender
Copy link
Author

Thank you so much!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

not-planned It's not planned in the future

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants