-
Notifications
You must be signed in to change notification settings - Fork 4
IDataFileMerger
FoolRunning edited this page Jul 26, 2022
·
4 revisions
An object that can be used to merge plugin data (text).
NOTE: For a standard XML-based merger that uses XMLDataMergeInfo, use IPluginHost.GetXmlMerger.
string Merge(string theirs, string mine, string parent)
Requests a three-way merge to be performed for plugin data (text).
| Parameter | Description |
|---|---|
| return value | The result of the merge. If null the data will be deleted. |
| theirs | The data from another user (i.e., obtained by a Send/Receive). If null the other user deleted the data. |
| mine | the last version of the data saved by the current user. If null the current user deleted the data. |
| parent | the common parent version If null both users added the data independently with no common parent version. |
| Exception | Condition |
|---|---|
| Exception | Something went wrong. This will cause the entire send/receive to fail. |
This page is auto-generated. User edits will be lost when regenerated.