WARP: Ignore function GUID merge conflicts

Fixes #8000

Author: CouleeApps

plugins/warp/src/plugin.rs

@@ -5,6 +5,7 @@ use crate::cache::container::add_cached_container;
 use crate::container::disk::DiskContainer;
 use crate::container::network::{NetworkClient, NetworkContainer};
 use crate::matcher::MatcherSettings;
+use crate::plugin::conflict_handler::ConflictHandler;
 use crate::plugin::render_layer::HighlightRenderLayer;
 use crate::plugin::settings::PluginSettings;
 use crate::{core_signature_dir, user_signature_dir};
@@ -13,6 +14,7 @@ use binaryninja::command::{register_command, register_command_for_function};
 use binaryninja::is_ui_enabled;
 use binaryninja::settings::{QueryOptions, Settings};
 
+mod conflict_handler;
 mod ffi;
 mod function;
 mod load;
@@ -129,6 +131,11 @@ fn plugin_init() -> bool {
     // Register our highlight render layer.
     HighlightRenderLayer::register();
 
+    // Register the conflict handler
+    if binaryninja::product() == "Binary Ninja Ultimate" {
+        ConflictHandler::register();
+    }
+
     if workflow::insert_workflow().is_err() {
         tracing::error!("Failed to register WARP workflow");
         return false;

plugins/warp/src/plugin/conflict_handler.rs

@@ -0,0 +1,28 @@
+use std::collections::HashMap;
+use binaryninja::collaboration::{register_conflict_splitter, ConflictSplitter, MergeConflict};
+use binaryninja::database::kvs::KeyValueStore;
+use binaryninja::rc::Ref;
+
+pub struct ConflictHandler {}
+
+impl ConflictHandler {
+    pub fn register() {
+        register_conflict_splitter(ConflictHandler {});
+    }
+}
+
+impl ConflictSplitter for ConflictHandler {
+    fn name(&self) -> String {
+        "WARPFunctionGUIDIgnorer".to_string()
+    }
+
+    fn can_split(&mut self, key: &str, _conflict: &MergeConflict) -> bool {
+        key.ends_with("/warp_function_guid")
+    }
+
+    fn split(&mut self, _original_key: &str, original_conflict: &MergeConflict, _result: &KeyValueStore) -> Option<HashMap<String, Ref<MergeConflict>>> {
+        // If there's a conflict on these, we should just delete them
+        original_conflict.success(None).ok()?;
+        Some(HashMap::new())
+    }
+}