Commit Graph

9 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
450fcb4973 feat: implement dev mode 2025-02-05 16:09:58 +10:30
Sam Chau
03059638ce refactor: remove API key from clone functionality 2025-02-05 16:09:58 +10:30
Sam Chau
3cc21c6951 feat: new button to push local branches, no longer auto pushes new branches to remote 2025-02-05 16:09:58 +10:30
Sam Chau
f7f4855953 refactor: adjust git file names 2025-02-05 16:09:58 +10:30
Sam Chau
856fc300de feat: improve unlink functionality - option to remove existing files - confirmation modal 2025-02-05 16:09:58 +10:30
Sam Chau
92b38db7a9 refactor: seperated cloning from settings 2025-02-05 16:09:58 +10:30
Sam Chau
fa4818cb6a refactor: move git operations into their own route 2025-02-05 16:09:58 +10:30