5 Commits

Author	SHA1	Message	Date
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
Sam Chau	fab2493d0a	feat: improved parsing of commit message in backend	2025-02-05 16:09:58 +10:30
Sam Chau	877c00c8c6	feat: updating diff modal. - not finished yet	2025-02-05 16:09:58 +10:30
Sam Chau	893d04afe9	fix: remove diff component mounting error - fixes modal animation for diffs	2025-02-05 16:09:58 +10:30
Sam Chau	7c6b476e96	refactor: complete refactor for settings page	2025-02-05 16:09:58 +10:30