1,114
edits
Changes
Jump to navigation
Jump to search
→Conflicts
Line 74:
Line 74:
+
Conflicts arise when the server and the local directory have conflicting dates (i.e. the versions on office computer and laptop were independently edited, so are now out of sync.) If there are conflicts to be resolved, then the applescript will post a dialog window.
Conflicts arise when the server and the local directory have conflicting dates (i.e. the versions on office computer and laptop were independently edited, so are now out of sync.) If there are conflicts to be resolved, then the applescript will post a dialog window.
− unison /User/houpt/uniDisk ssh://houptlab.org/uniDisk -ui text -times -ignore 'Name .DS_Store'
+To resolve the conflicts, run the following command (make sure you are in Users/houpt directory)
+ unison uniDisk ssh://houptlab.org/uniDisk -ui text -times -ignore 'Name .DS_Store'
For each conflict, < moves from server to local, > moves from local to server, / skips the file, f means follow Unison recommendation.
For each conflict, < moves from server to local, > moves from local to server, / skips the file, f means follow Unison recommendation.