4 ms·

I wonder how conflicts are resolved, especially binary files.

• codetrotter 5y ago
  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.
• deleted 5y ago
  [deleted]
• Anunayj 5y ago
  Well I'm guessing nobody would be merging two different heads. and if they do manually from the cli, however git would.
  • kadoban 5y ago
    "however git would" is by asking the user what to do. This automatically pushes, even if the push isn't clean it sounds like. It's unclear to me exactly what that means, `push -f` ? A pull with some options first if upstream can't be fast-forwarded? Doesn't sound very...safe.