Resolve layer conflicts when saving a Boss’nX schema

When someone else saves changes to the same schema while you are editing it, your save opens the Resolve conflicts window. For each layer changed on both sides, you choose which version to keep: the server’s or yours.

Intended for administrators and installers who save a schema in the Boss’nX editor. The window appears during the save of a schema. To add, rename or delete a layer, see layer management instead.

Before you start

• Your role is allowed to View schemas and Edit schemas; see the role capabilities if needed.
• You are working on a computer, in a Boss’nX supervision opened directly or from the hypervision.

Do not choose a version just to close the window: each choice decides which version of the layer will be saved.

Compare the two versions of each layer

1. Find the layer name at the top of each card.
2. Compare the Server and You columns. Server shows the saved version, with an author and a date when they are available. You shows your unsaved local edits.
3. Read the Added, Modified and Removed lines, their counts and the types of elements concerned. Hover over the details of a type to see the available names. +… more groups additional types, with details on hover.
4. Also read indications such as background changed, canvas size changed, layer name changed and Datapoints. This summary helps you compare, without necessarily detailing every property.
5. If baseline unavailable — showing current state only appears, the detailed comparison is not available, which does not rule out differences. If you cannot decide reliably, click Cancel save and contact support.

Fictitious example: you renamed the Hall layer, while someone else changed its background. Choosing a version keeps the layer as it is in that version: your name and their background are not combined automatically.

Choose the version of each layer

Choice	Consequence when saving with these choices
Keep server	Keeps the version saved on the server for this layer. Your concurrent local edits to this layer are not retained.
Keep mine	Keeps your local version of the layer. Concurrent changes present only in the other version may be replaced.

The server version is preselected each time the window opens. Check the selected choice on each card, even if you made a selection during a previous attempt.

You can keep the server version for one layer and yours for another. The choice applies to the whole layer: properties are not merged within the same layer.

Choose for a layer you deleted

A card can indicate that you deleted a layer and that someone else modified it since you loaded it. The choices become:

• Keep the server version: gives up your deletion and keeps, when saving, the layer saved on the server.
• Delete anyway: prepares the deletion of the layer despite the concurrent change.

After your selection, Save with choices is still required. This window handles a layer deleted in the editor; it does not restore a schema already deleted from the Schemas list.

Prepare all choices at once

Keep all server preselects the server version for all the conflicts shown. Keep all mine preselects your version. These commands prepare the choices; the save itself happens with Save with choices.

With several conflicts, Keep all mine opens Overwrite other users’ edits?:

1. Review the layers concerned and the author shown when available.
2. Click Cancel to keep the previous selections, or Yes, keep mine for all only if you want to prepare this replacement for all these conflicts.
3. Then review each card. You can still change a choice individually before the final save.

With a single conflict, the global selection happens without this extra confirmation. In both cases, check the choices before saving.

View the layer before deciding

To the right of a layer name, the diagonal arrow offers Switch to layer, with the tooltip Switch to this layer to peek at the canvas before deciding.

1. Click this arrow to show the layer in the editor. The window collapses into a Resume — … conflict(s) pending button, at the bottom right.
2. Examine the layer in the editor. This switch does not apply the server version and does not compare the two drawings automatically.
3. Click Resume — … conflict(s) pending, or press Esc, to return to the cards and find your choices.

During this review, the save keeps waiting for your decision, and the editor’s Undo and Redo remain blocked. Return to the choices to finish or cancel the save.

Save with your choices

1. Click Save with choices at the bottom of the window.
2. Wait until it finishes, without closing or refreshing the page.
3. Check the Configuration saved successfully. message and the layer summary.

Stop without saving

To stop the resolution, click Cancel save. While the window is open, Esc or a click outside the window has the same effect. Your draft stays in the editor and you can review it.

This cancellation does not restore earlier versions of changes already saved. If a new attempt opens the conflicts again, review the proposed choices.

Check the result

1. Open Schemas in the header bar or in the Menu, then explicitly select the right schema and its layer.
2. If needed, reopen Actions → Edit schema and wait for it to load.
3. After a choice on a deleted layer, check the layer list.

Troubleshooting

• Partial result after the save: follow save troubleshooting.
• Uncertain choice, persistent message or unexpected result: see the questions about conflicts.
• Comparison not possible, for example with an unavailable baseline: use Cancel save, then write to support@can-nx.com with the schema, the layer, the message and the changes you want to keep.

French labels: Résoudre les conflits, Serveur / Vous, Garder le serveur / Garder les miennes, Conserver la version du serveur, Supprimer quand même, Tout prendre du serveur / Tout garder des miennes, Sauvegarder avec ces choix, Écraser les modifications des autres utilisateurs ?, Oui, tout garder des miennes, Aller au calque, Reprendre — … conflit(s) en attente, Annuler la sauvegarde.