•
|
The type column — the type of the changed item represented by an icon.
|
•
|
The Source Change column — a description of the item change.
|
•
|
The Conflicting Target Changes column — one or more changes on the target branch that are incompatible, or in conflict, with the source change.
|
•
|
The Selection column — an icon representing whether to include the source change (), ignore the source change (), or if there is a conflict ().
|
•
|
Click the Refresh button () to refresh the table in case any new commits have been saved on the target branch.
|
•
|
Click the Take Source button () to include a source change in the merge. This is the default choice.
|
•
|
Click the Keep Target button () to ignore a source change, keeping the target as is.
|
•
|
2
|
Select the model version on the source branch in The Model Manager Window and click the Compare button () in the Item section of the Home toolbar.
|
3
|
4
|
5
|
Save a new version of the model to the target branch from the Save window. This becomes the merged model version.
|
6
|
Click the Refresh button () in the Merge window’s toolbar to recompute source and target branch changes.
|
7
|
If there is still a conflict between the source branch and target branch for the model update, which is expected, select the row and click the Keep Target button () to keep the merged model version on the target.
|
Once a source commit has been merged into a target branch, any changes on the source branch that were skipped will not show up in the Merge window the next time you open the window for a newer source commit. To include such older source changes, manually perform them on the target branch.
|
You may find the number of source changes in the Merge window overwhelming if there has been many commits on the source branch. One solution is to first merge from an older commit on the source branch, and then progressively work yourself up to the latest commit. One drawback is that this requires more than one merge commit on the target branch, which may unnecessarily pollute the commit history on that branch.
|