Alejandro Rodríguez bb2bf39ddf Cache `#can_be_resolved_in_ui?` git operations		2018-03-08 11:54:21 -03:00
..
base_service.rb	Fix conflict resolution from corrupted upstream	2017-05-12 20:47:51 +01:00
list_service.rb	Cache `#can_be_resolved_in_ui?` git operations	2018-03-08 11:54:21 -03:00
resolve_service.rb	Refactor conflict resolution to contain git ops within Gitlab::Git	2017-10-12 22:03:14 -03:00