API Reference > Namespaces > revision_control Namespace > Classes > RevisionControl Class > RevisionControl Methods > RevisionControl::merge Method
RevisionControl::merge Method
|
Parameters |
Description |
|
const OdString& merge_from_branch |
[in] source branch name |
|
OdTfMergePolicy merge_policy |
[in] merge policy to handle conflict situations |
|
OdArray<OdDbObjectId>& conflicting_objects |
[out] array of objects id which is conflicting note |
Incorporates changes from the certain branch into the current branch. If there are conflicts conflicting_objects will contain list of conflicting objects
|
Copyright © 2002–2020. Open Design Alliance. All rights reserved.
|
