spec/lib/gitlab/conflict/file_collection_spec.rb · b2932eb576427abcf6a9f71b1a1a5ef057b22eb8 · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Skip to content

GitLab

Explore

Sign in

Forest Godfrey
gitlab-ce
Repository

gitlab-ce
spec
lib
gitlab
conflict
file_collection_spec.rb

Blame History Permalink

Refactor conflict resolution to contain git ops within Gitlab::Git · 3fcab51e
Alejandro Rodríguez authored Oct 06, 2017
```
This prepares the codebase for a Gitaly migration. See
https://gitlab.com/gitlab-org/gitaly/issues/553
```
3fcab51e