• Alejandro Rodríguez's avatar
    Simplify conflict resolver interface · 240945f8
    Alejandro Rodríguez authored
    This does two things:
    - Pass commit oids instead of `Gitlab::Git::Commit`s. We only need the
    former.
    - Depend on only the target repository for conflict listing. For
    conflict resolution, treat one repository as a remote one so that we can
    implement it as such in Gitaly.
    240945f8
file_collection.rb 1.82 KB