Skip to content

Reimplement ResolveConflicts without git2go

Reimplement the ResolveConflicts RPC without git2go. This will be difficult with current code, and will likely require an update to Git to accomplish this in-memory.

Edited by John Cai
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information