Sam Chau ca84a1c95b feature: merge conflict detection and resolution (#6) ...

- pulls now correctly identify merge conflicts and enter a merge state
- user resolves each file individually
- commit resolve merge state
- allows users to keep custom changes and pull in updates
- improve commit message component
- seperated commit / add functionality

2025-02-05 16:09:58 +10:30

..

diagrams

feature: merge conflict detection and resolution (#6)

2025-02-05 16:09:58 +10:30