3 Commits

Author	SHA1	Message	Date
Sam Chau	529072dc6c	feature: Commit Log Viewer (#7) ... * style: slightly decrease font / button size for repo container * feat: view commit modal to view local commit details * fix: allow staging and comitting deleted files * feat: handle modify-delete edge case - local side deleted, remote modified - let user pick between restore, keep deleted - special handling for editing * feat: handle empty state for commits modal	2025-02-05 16:09:59 +10:30
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	ec7430466f	refactor: move git operations into seperate files	2025-02-05 16:09:58 +10:30