Resolving conflicts
As already mentioned, the conflict overview is primarily used for information, so that you can take suitable activities. Many things cannot be dealt with automatically or can arise owing to an application error (which it will at least warn you of here).
Nevertheless the conflict overview does offer you two auxiliary functions:
Note: All other problems
must be dealt with using the functions and procedures described elsewhere in
this manual.
Directly repair conflict
Updating conflicts which are repaired by simple updating of the document can be dealt with directly.