Skip to content

Two-way remote file sync and conflict resolution application

License

Notifications You must be signed in to change notification settings

lte678/fmerge_cpp

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

83 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

fmerge Build Tests

A file sync tool to keep folders synchronized across multiple computers


What does it do?

This tool does a little bit more than a standard rsync (for example) would do when run on both computers. What it also does, is keep track of which files exist when to allow us to differentiate between the create of a file in one folder from the deletion of that same file in another. This most importantly allows file deletions to be propagated between peers.

It also presents a conflict resolution dialog to unify conflicting changes.

How is it used?

With much care. It is currently not thoroughly tested.

The tool is executed in a client-server configuration, but these have no special meaning; The software should in theory yield identical results both ways around.

Current Status

Currently, fmerge can occasionally keep two computers in sync, but still has numerous issues and is missing the following features:

  • Large file support (file size limited by RAM currently)
  • Daemon mode for server

Author

Me!

About

Two-way remote file sync and conflict resolution application

Topics

Resources

License

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Languages