Hover over any conflict indicator to see detailed information about who made the change, when, and on which branch—plus quick actions to resolve or explore further.
Screenshot
Expanded hover tooltip showing author info, commit details, and action buttons
Screenshot
Author section showing avatar, name, and email
Screenshot
Commit section showing hash, message, time, and branch
The tooltip includes action buttons for common operations:
Screenshot
Quick action buttons: View Diff, Dismiss, Cherry Pick, Open on GitHub
| Action | Description |
|---|---|
| View Diff | Open side-by-side diff of the conflicting changes |
| Dismiss | Mark this conflict as acknowledged |
| Cherry Pick | Apply their changes to your branch |
| Open on GitHub | View the commit on GitHub |
When a conflict spans multiple lines, hover over any line in the range to see the full context:
Screenshot
Tooltip for multi-line conflict showing 'Lines 45-52' range
The tooltip shows the complete affected range so you understand the full scope.
Soft warnings (yellow indicators) show slightly different information:
Screenshot
Yellow warning tooltip with softer styling
{
"gitspectra.hover.showAvatar": true,
"gitspectra.hover.showFullMessage": false, // Show full commit message
"gitspectra.hover.delay": 200 // Milliseconds before showing
}