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	f54d577a54	fix: adjust push authentication method	2025-02-05 16:09:58 +10:30
Sam Chau	adc7fe836a	feat: add auth to git operations	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	ec7430466f	refactor: move git operations into seperate files	2025-02-05 16:09:58 +10:30