Start the merge using either of the following:
You can apply this method of starting a merge exclusively to Teamwork server and Teamwork Cloud projects. For Teamwork Cloud projects, you do not need to specify the ancestor; it will be instantly identified after the source is selected. For Teamwork server projects, the 3-way merge will be applied if you select project versions from different branches. Please note that the 2-way merge will be applied if you select an older version from the same branch or trunk.
You can apply this method of starting a merge to both local and server projects, although used projects can be included in a merge only for server projects. You must specify both the source and the ancestor, and manually choose the 3-way or 2-way merge.
|
To start a merge from Collaborate > Merge From
Memory, to decrease memory usage while merging the projects if your computer does not have enough memory. This will use less memory but at the same time will slow down the merge procedure when the project has many changes in diagrams. It will not include the differing diagrams/elements count. If you need that information, select optimize for Speed.
You can also specify the Optimize for option in the Environment Options dialog. Find this option under the Merge category in the General options group. |
In the Used projects to include list, select the used projects of the target you want to merge with the appropriate used projects of the selected source. To select a used project, click the check box next to the used project name (see the following figure).
The list includes only the projects that:
|
To start merge from Tools > Project Merge
Select the type of merge.
Learn about 3-way and 2-way merge in Choosing merge type . |
Memory, to decrease memory usage while merging the projects if your computer does not have enough memory. This will use less memory but at the same time will slow down the merge procedure when the project has many changes in diagrams. It will not include the differing diagrams/elements count. If you need that information, select optimize for Speed.
You can also specify the Optimize for option in the Environment Options dialog. Find this option under the Merge and Compare category in the General options group. |
In the Used projects to include list, select the used projects of the target you want to merge with the appropriate used projects of the selected source. To select a used project, click the check box next to the used project name (see the following figure).
The list is available only for server projects and includes only the projects that:
|
Click the Merge button. The project merge will start. If changes are found, the Merge window will open. Proceed to Analyzing and managing merge results.
To start a merge of the from Collaborate > Merge From
Do one of the following:
Click Continue to lock the server project. Other users will not be able to commit changes.
Click Show Merge Results to proceed directly to the Merge Results, without locking the server project.
To start merge from Tools > Project Merge
Select a project that will be the source.
Memory, to decrease memory usage while merging the projects if your computer does not have enough memory. This will use less memory but at the same time will slow down the merge procedure when the project has many changes in diagrams. It will not include the differing diagrams/elements count. If you need that information, select optimize for Speed.
You can also specify the Optimize for option in the Environment Options dialog. Find this option under the Merge and Compare category in the General options group. |
Do one of the following:
Click Continue to lock the server project and continue the merge process. Other users will not be able to commit changes.
Click Show Merge Results to proceed directly to the Merge Results.
The project merge will start. If changes are found, the Merge window will open. Proceed to Analyzing and managing merge results.
To start merge from Tools > Project Merge
Select the type of merge.
Learn about 3-way and 2-way merge in Choosing merge type . |
Memory, to decrease memory usage while merging the projects if your computer does not have enough memory. This will use less memory but at the same time will slow down the merge procedure when the project has many changes in diagrams. It will not include the differing diagrams/elements count. If you need that information, select optimize for Speed.
You can also specify the Optimize for option in the Environment Options dialog. Find this option under the Merge and Compare category in the General options group. |
Click the Merge button. The project merge will start. If changes are found, the Merge window will open. Proceed to Analyzing and managing merge results.