Christian Jann
e4d8e793f6
- use the latest version of the two files under its original filename in both destinations (same as currently implemented) - additionally, create a copy of the older file under a different name using the same file extension with appended marker (e.g. "conflict") and timestamp in both destinations (e.g. textfile.odt -> textfile_conflict-20100222-105000.odt) - At the Moment 'textfile_conflict-20100222-105000.odt' is only created on the side where the conflict has occurred and gets synced to the other side on the second sync.
WHAT IS CSYNC?
==============
csync is a lightweight utility to synchronize files between two directories on
a system or between multiple systems.
It synchronizes bidirectionally and allows the user to keep two copies of files
and directories in sync. csync uses widely adopted protocols, such as smb or
sftp, so that there is no need for a server component. It is a user-level
program which means you don’t need to be a superuser or administrator.
CONTRIBUTIONS
=============
If you want to contribute to the development of the software then please join
the mailing list. Patches are accepted preferebly created with git and we are
always glad to receive feedback or suggestions to the address
csync-devel@csync.org.
More information on the various mailing lists can be found at
http://www.csync.org/communication/.
You can also get the sourcecode straight from the git repository - see
https://dev.csync.org/wiki/GetTheSource
DOCUMENTATION
=============
As a user you can find a userguide which is shipped with this package or is
available at the website. For developers there is doxygen documentation and
comments in the source code itself. See
http://www.csync.org/userguide/
and
http://www.csync.org/api/