The previous conflict detection only worked for merge-based pulls
(--no-rebase) but failed to detect pre-existing conflicts from
interrupted rebases or prior sessions. This fixes three root causes:
1. Rust: add is_rebase_in_progress/is_merge_in_progress/get_conflict_mode
helpers, and dispatch git_commit_conflict_resolution between
`git commit` (merge) and `git rebase --continue` (rebase)
2. Frontend: add startup conflict check via get_conflict_files before
pulling, so pre-existing conflicts are detected on app launch
3. App.tsx: handleOpenConflictResolver now fetches conflicts directly
when the cached list is empty, preventing the silent early-return
Also exposes get_conflict_files and get_conflict_mode as Tauri commands
so the frontend can independently check conflict state.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
5775cb0c96