Select Git revision
conflicts_service.rb
-
Alejandro Rodríguez authored
- Add a Gitlab::Git::Conflict::Resolution class to encapsulate resolution data - Simplify conflict file collection assembly
Alejandro Rodríguez authored- Add a Gitlab::Git::Conflict::Resolution class to encapsulate resolution data - Simplify conflict file collection assembly
