Skip to content

Port ResolveConflict to Go

The ResolveConflicts RPC in the ConflictsService is served through the Gitaly-Ruby sidecar. It currently leverages LibGit2 to efficiently detect and fix conflicts in the index. It should probably continue to use LibGit2 through Git2Go.

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