almost

src-tauri/src/main.rs

@@ -5,8 +5,8 @@ mod git;
 use git::{
     checkout_branch, commit, compare_commits, diff_file_against_working_tree, get_status,
     list_branches, list_commits, list_file_history, list_repository_files, merge_branch,
-    open_repository, pull, push, restore_file_from_commit, restore_files, restore_to_commit,
-    stage_files, unstage_files,
+    open_repository, pull, push, read_conflict, resolve_conflict, restore_file_from_commit,
+    restore_files, restore_to_commit, stage_files, unstage_files,
 };
 
 fn main() {
@@ -29,7 +29,9 @@ fn main() {
             list_repository_files,
             list_file_history,
             compare_commits,
-            diff_file_against_working_tree
+            diff_file_against_working_tree,
+            read_conflict,
+            resolve_conflict
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");