9 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	5c8c647be1	fix: stop appending token for 2+ requests	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	15cd66a775	fix: delete and checkout now work properly - checkout local only / remote only branches - delete local only / not remote branches if !dev mode	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	20ff5c822b	fix: fix checkout / delete branches	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	fa4818cb6a	refactor: move git operations into their own route	2025-02-05 16:09:58 +10:30
Sam Chau	623f510ff9	refactor: move branch functionality into seperate files	2025-02-05 16:09:58 +10:30