Skip to content

Offer resolve conflicts in focus view#5972

Merged
alexr00 merged 1 commit intomainfrom
alexr00/issue5942
May 3, 2024
Merged

Offer resolve conflicts in focus view#5972
alexr00 merged 1 commit intomainfrom
alexr00/issue5942

Conversation

@alexr00
Copy link
Member

@alexr00 alexr00 commented Apr 26, 2024

Fixes #5942

@alexr00 alexr00 self-assigned this Apr 26, 2024
@alexr00 alexr00 added this to the May 2024 milestone Apr 29, 2024
@alexr00 alexr00 marked this pull request as ready for review April 29, 2024 10:58
@alexr00 alexr00 merged commit 58790ee into main May 3, 2024
@alexr00 alexr00 deleted the alexr00/issue5942 branch May 3, 2024 07:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Make conflicts hint actionable

2 participants