Alejandro Rodríguez 351f205c05 Incorporate ConflictsService.ListConflictFiles Gitaly RPC		2017-12-27 15:12:30 -03:00
..
base_service.rb	Fix conflict resolution from corrupted upstream	2017-05-12 20:47:51 +01:00
list_service.rb	Incorporate ConflictsService.ListConflictFiles Gitaly RPC	2017-12-27 15:12:30 -03:00
resolve_service.rb	Refactor conflict resolution to contain git ops within Gitlab::Git	2017-10-12 22:03:14 -03:00