Port ResolveConflicts from Ruby to Go

Edited by Paul Okstad (ex-GitLab)

Merge request reports

Loading