Snippets Groups Projects

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

conflict_file.rb

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

History
Refactor conflict resolution to contain git ops within Gitlab::Git
Alejandro Rodríguez authored 7 years ago
```
This prepares the codebase for a Gitaly migration. See
https://gitlab.com/gitlab-org/gitaly/issues/553
```