![]() - Add a Gitlab::Git::Conflict::Resolution class to encapsulate resolution data - Simplify conflict file collection assembly |
||
---|---|---|
.. | ||
file.rb | ||
file_collection.rb |
![]() - Add a Gitlab::Git::Conflict::Resolution class to encapsulate resolution data - Simplify conflict file collection assembly |
||
---|---|---|
.. | ||
file.rb | ||
file_collection.rb |