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

backend

feature: merge conflict detection and resolution (#6)

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

docs/diagrams

feature: merge conflict detection and resolution (#6)

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

frontend

feature: merge conflict detection and resolution (#6)

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

.gitignore

feature: merge conflict detection and resolution (#6)

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

.prettierrc

chore: add prettier formatting for frontend

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

docker-compose.yml

feature: merge conflict detection and resolution (#6)

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

Description

Configuration Management Platform for Radarr/Sonarr

GPL-3.0 22 MiB

Languages

JavaScript 64.8%

Python 34.8%

CSS 0.2%