Issue #333: Simultaneous changes on different instances cause incorrect merge https://github.com/presslabs/gitfs/issues/333 https://github.com/presslabs/gitfs/

Issue #333: Simultaneous changes on different instances cause incorrect merge https://github.com/presslabs/gitfs/issues/333 https://github.com/presslabs/gitfs/issues/333 Seems like conflicts are being resolved poorly.