Preview Local and Server Changes before Commit or Update

When working collaboratively as a team, we often need to know how our work may affects the others work, or vice versa. Visual Paradigm team collaboration support lets you know the changes that will occur in project when attempting to committing or updating works. In this release, you also can preview the changes. With this improvement, you can preview what you have modified before confirming a commit action. You can also preview what others have changed prior to updating their changes from server. More important, the preview can help resolving conflicts by foreseeing the result of overwrite and revert.

Previewing changes

	Here is a project that consists of a class diagram.
Let's commit it.
The Commit dialog box appear.
To see the Preview, open the Preview tab.
Select an item from the change list to activate the preview.
There are two sections in the Preview page. The Server section preview the server side changes, while the Local side preview the changes that will occur in our local copy. Besides previewing changes that we've made, we also can see the changes that other team members have made and committed, which will be brought to our local copy.

Dealing with Conflict

Suppose our colleague has renamed a class, and have committed the change. If we rename the same class...

...this will result in a conflict during commit or update. We can see that the server side preview is presenting the class with the name given by our colleague, while the local side is presenting our change.

We can resolve a conflict through the toolbar or by pressing the buttons in the pane on the right.

Once a solution to a conflict is decided, the preview will be updated accordingly. In this case, if we select to resolve conflict by overwriting with local modifications, the local preview will present the local modifications.

If we select to revert, the local preview will present the content of server copy.

Resources