Alejandro Rodríguez faa9bd402d Create a Gitlab::Git submodule for conlict-related files ... Rename classes to (hopefully) clearer names while we're doing that.		2017-10-12 22:03:15 -03:00
..
base_service.rb	Fix conflict resolution from corrupted upstream	2017-05-12 20:47:51 +01:00
list_service.rb	Create a Gitlab::Git submodule for conlict-related files	2017-10-12 22:03:15 -03:00
resolve_service.rb	Refactor conflict resolution to contain git ops within Gitlab::Git	2017-10-12 22:03:14 -03:00