| 489 | |
| 490 | |
| 491 | Ref<Snapshot> BinaryNinja::Collaboration::MergeSnapshots(Ref<Snapshot> first, Ref<Snapshot> second, std::function<bool(const std::unordered_map<std::string, Ref<AnalysisMergeConflict>>& conflicts)> conflictHandler, ProgressFunction progress) |
| 492 | { |
| 493 | ProgressContext pctxt; |
| 494 | pctxt.callback = progress; |
| 495 | |
| 496 | DatabaseConflictHandlerContext chctxt; |
| 497 | chctxt.callback = conflictHandler; |
| 498 | |
| 499 | BNSnapshot* snapshot = BNCollaborationMergeSnapshots(first->m_object, second->m_object, DatabaseConflictHandlerCallback, &chctxt, ProgressCallback, &pctxt); |
| 500 | if (snapshot == nullptr) |
| 501 | throw SyncException("Failed to merge snapshots"); |
| 502 | |
| 503 | return new Snapshot(snapshot); |
| 504 | } |
| 505 | |
| 506 | |
| 507 | std::string BinaryNinja::Collaboration::DefaultProjectPath(Ref<RemoteProject> project) |
nothing calls this directly
no test coverage detected