conflict
Temporary storage of the conflicting entities.
Methods
| AcceptCus | Keeps the current version. |
| AcceptNew | Accepts the new version as the current version. |
| SetResolved | Declare an entity as having no more conflicts. |
Generic Methods
![]() | ![]() |
| AcceptCus | Keeps the current version. |
| AcceptNew | Accepts the new version as the current version. |
| SetResolved | Declare an entity as having no more conflicts. |