Skip to content

Conversation

Byron
Copy link
Member

@Byron Byron commented Aug 17, 2025

Improvements in support of gitbutlerapp/gitbutler#9725.

Tasks

  • provide all conflict entries
    • Rename Conflict to ConflictSummary

Byron added 3 commits August 17, 2025 10:28
That way it's possible to rely on the status information without the need
to access the index separately.

Note that to make this work, `PartialOrd|Ord|PartialEq|Eq` had to be removed from the type.
@Byron Byron marked this pull request as ready for review August 17, 2025 11:47
@Byron Byron merged commit f3be6e3 into main Aug 17, 2025
25 checks passed
@Byron Byron deleted the improvements branch August 17, 2025 13:17
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.

1 participant