Test bf6312000e feat: add sync conflict resolution — resolve merge conflicts in-app ...

- Add git_resolve_conflict and git_commit_conflict_resolution Rust commands
- Create useConflictResolver hook for per-file resolution state management
- Create ConflictResolverModal with keyboard shortcuts (K/T/O/Enter/Esc)
- Make StatusBar conflict chip clickable to open resolver modal
- Add 'Resolve Conflicts' command to command palette (conditional)
- Pause auto-pull while conflict resolver modal is open
- Tests: 5 new Rust tests, 10 new hook tests, 1 new auto-sync test

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

2026-03-03 02:45:42 +01:00

..

capabilities

fix: remove http:default capability (plugin not installed)

2026-03-01 12:00:19 +01:00

icons

feat: update app icon (green cloud + home)

2026-02-28 19:26:23 +01:00

src

feat: add sync conflict resolution — resolve merge conflicts in-app

2026-03-03 02:45:42 +01:00

.gitignore

Initialize Tauri v2 + React + TypeScript project with vault scanner

2026-02-14 18:20:07 +01:00

build.rs

feat: show dynamic build number in status bar (bNNN format) (#163)

2026-03-02 01:50:41 +01:00

Cargo.lock

fix: use Tauri opener plugin for URL property clicks

2026-02-25 00:02:09 +01:00

Cargo.toml

fix: add devtools feature to tauri for open_devtools() support

2026-02-26 11:09:07 +01:00

tauri.conf.json

fix: bundle mcp-server into release app so AI Chat works (#178)

2026-03-02 23:31:04 +01:00