Synchronization and Conflict Resolution

The Atelier development model requires synchronization of source code on client and server machines. You can invoke the Atelier synchronization wizard command in the following ways:

The Conflict Resolution wizard opens automatically when there are version conflicts between client and server. Version conflicts arise when code has been modified on the server more recently than on the client, such as by editing code directly on the server.

The wizard presents the client version of the file in the left pane of the wizard, and the server version on the right. Buttons at the upper right let you navigate through the differences between the versions:

Toolbar Button Command Description
next difference Next Difference Go to the next line where the local and server copies differ. Steps through the files line by line.
previous difference Previous Difference Go to the previous line where the local and server copies differ. Steps through the files line by line.
next difference Next Change Go to the next change in file content. Steps through changes in a line.
next difference Previous Change Go to the previous change in file content. Steps through changes in a line.

The wizard indicates these differences visually. Rectangular indicators in the right margin show where differences are in the file, and which difference is selected. The following image shows the conflict resolution wizard resolving a single file with the first difference selected.

conflict resolution wizard

The buttons perform the following actions:

When the Conflict Resolution wizard opens in response to conflicts in more than one file, it provides the following additional information:

conflict resolution wizard

It also provides the following controls:

The following image shows the wizard controls set to save the local copy for all unresolved files when you click Finish.

conflict resolution wizard

Related concepts

Working with Atelier

Related reference

Atelier Explorer View
Save Settings Preferences