On this page
The Lock-Free Editing mode, the default mode for the 3DEXPERIENCE platform, enables you to work with model elements without needing to lock them. Keep in mind that this is applicable to model elements only. Locks for diagrams, project options, and used projects will persist; you will still have to lock them before editing.
Recommendation
Assigning different scopes of the model to various users is the recommended way to work in the Lock-Free Editing mode to prevent conflicts that may occur when users' changes interfere with each other.
Even though users usually work on different parts of the model, occasionally when they edit the same model elements conflicting changes may occur. In that case, you will be asked to review these conflicts in the Conflicting Changes panel and then take action, such as confirming the update result or discarding local changes.
Example #1
User 1 and User 2 are working on the same model iteration: [1] A.1. The model contains Class A.
User 1 deletes Class A from the model and commits the project to the server. Model iteration [1] A.2 is created.
User 2 renames Class A to Class B and commits/updates the project to the server. Conflicting changes occur.
Example #2
User 1 and User 2 are working on the same model iteration: [1] A.1. The model contains Class A.
User 1 renames Class A to Class B and commits the project to the server. Model iteration [1] A.2 is created.
User 2 renames Class A to Class C and commits the project to the server. Conflicting changes occur.
Conflicting Changes panel
To open the panel
- In the main menu, click Window.
- Select Conflicting Changes from the drop-down menu. The Conflicting Changes panel opens.
The Conflicting Changes panel.
Alternatively, you can open it by clicking the Review Conflicts button directly on the warning that appears when conflicting changes are detected.
The Conflicting Changes warning.
Please note that conflicting changes are checked upon a project update or a commit that requires an update.
Composition of the Conflicting Changes panel
The Conflicting Changes panel consists of three smaller panels that provide the following pieces of information to the user:
- Conflicting Local Changes: shows locally modified elements whose changes conflict with the changes already committed to the server.
- Upcoming Changes: shows the upcoming changes that conflict with the selected local change.
- Preview Update Result: shows the changes that will be applied after the project update.
Conflicting Changes panel informs users about the changes that conflict in the project.
Symbols used in the Conflicting Changes panel
| Icon | Description |
|---|---|
| Checks the presence of the conflicting changes in the model. |
| Selects the previous conflicting change on the list. |
| Selects the next conflicting change on the list. |
| Expands elements in the Conflicting Local Changes panel. |
| Collapses elements in the Conflicting Local changes panel. |
| Confirms the update result affecting the selected element. |
| Confirms all update results of the conflicting changes at once. |
| Filters confirmed/unconfirmed conflicting changes.
|
| Shows that the conflicting change has been confirmed by the user.
|
Resolving conflicting changes
Confirming update results
Once you have reviewed the conflicting changes, you can confirm the update result that will be applied after the project update. It should be emphasized that remote deletions always take precedence over local changes.
To confirm an update result
- In the Conflicting Changes panel, do one of the following:
- select the specific conflicting element and click
in the toolbar at the top. - click
in the toolbar to confirm all conflicting changes at once.
- select the specific conflicting element and click
Right-click the conflicting element and select Confirm Update Result in the shortcut menu. The acknowledged change is marked with a green tick
.
Confirming the conflicting changes via the shortcut menu.
The following outlines another group of actions you can perform to handle detected conflicting changes:
- Select in Containment Tree: click to select the element in Containment tree.
- Quick Diff: select to inspect the conflicting changes in a compact form.
- Full Diff: select to inspect the conflicting changes in a detailed form.
- Compare Projects: select to compare the modified projects.
- Discard Changes: select to discard the local changes.
Please note that you cannot undo the discarded changes.
Depending on the action you have performed prior to the detection of conflicting changes in your model, you will see either the Commit or the Update button in the Conflicting Changes panel after confirming the conflicting changes in your project.
Update or Commit button in the Conflicting Changes panel.
Disabling the Lock-Free Editing mode
To lock all lockable elements and work in a lock-required mode, disable lock-free editing.
To disable the Lock-Free Editing mode
- In the main menu, click Options > Project.
- In the panel on the left, select General > Collaboration.
- Under the Locking options, disable Lock-Free Editing by setting the value to false, and click OK.
In the Question dialog asking whether you want to commit the changes to the server, select Continue.
- In the Information dialog, click OK. The Lock-Free Editing mode is now disabled.
If the Lock-Free Mode is disabled in the project, users who worked without locks will not be able to commit their changes to the server. We recommend making sure that all users working on the model do not have uncommitted changes before switching modes.