Page History

It sometimes happens that someone edits an element that you edited too. For some time you are not aware of this, but as soon as you start merging, the system will present you with a conflict. How do you act when a conflict occurs? The following steps show how to resolve a conflict.

Step-by-step guide

In case someone has updated an element in one branch and you have updated the same element too, the following happens:

...