Back to [wiki:Help Main Help]

= Conflicts Dialog =

Make sure you don't edit outside of the area you have downloaded in order to reduce the problem of conflicts

Resolve conflicts by opening the 'conflicts' panel, selecting the one of the listed conflicts and choosing whether to accept 'theirs' or 'mine'.

TODO expand on this explanation.

Back to [wiki:Help Main Help]