Changes between Version 1 and Version 2 of Help/Dialog/Conflict


Ignore:
Timestamp:
Feb 9, 2009 1:01:29 PM (4 years ago)
Author:
Harry Wood
Comment:

some very basic info about conflicts

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/Conflict

    v1 v2  
    33= Conflicts Dialog = 
    44 
     5Make sure you don't edit outside of the area you have downloaded in order to reduce the problem of conflicts 
     6 
     7Resolve conflicts by opening the 'conflicts' panel, selecting the one of the listed conflicts and choosing whether to accept 'theirs' or 'mine'. 
     8 
     9TODO expand on this explanation. 
     10 
    511Back to [wiki:Help Main Help]