GitFS is a fuse- and git-based remote filesystem with local cache for disconnected operation. It does periodic commits and pushes/pulls to keep a local shadow file system in sync with a remote repository. The filesystem should continue to work when you are disconnected. Merging after disconnected updates from multiple locations is left to git.