-
Simplify conflict resolution interface and code · 65e3a1e9Alejandro Rodríguez authored
- Add a Gitlab::Git::Conflict::Resolution class to encapsulate resolution data - Simplify conflict file collection assembly
65e3a1e9
×
BigW Consortium Gitlab
- Add a Gitlab::Git::Conflict::Resolution class to encapsulate resolution data - Simplify conflict file collection assembly