3.6 Conflicts
Conflicts may occur if two or more users work on the same database item or interlinked database items. This is best avoided by directly coordinating work within your team as well as performing regular pulls and to push regularly. The diff utility (under section 4.2) assists in detecting commits by other users and identifying potential conflicts (see section 3.7).
If a conflict exists, the user will be notified by the Collaboration Server like shown in the figure below.
It is strongly recommended to use 'Commit changes' to avoid any potential data loss. This way, your uncommitted changes will be stored in the local repository before continuing the merge process.
Stash changes gets the external changes, puts them in the local database, and puts the local changes in a “box”. The user can access this box, or stash, like shown in figure below.
After clicking “Apply“, the Merge dialogue (figure below) will open, where you can see the differences between your local database and the repository, and decide what to do.
