kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/lib/gitlab/git/conflict
History
Alejandro Rodríguez 65e3a1e9e9 Simplify conflict resolution interface and code 
- Add a Gitlab::Git::Conflict::Resolution class to encapsulate
resolution data
- Simplify conflict file collection assembly
2018-01-02 16:22:02 -03:00
..
file.rb Simplify conflict resolution interface and code 2018-01-02 16:22:02 -03:00
parser.rb Create a Gitlab::Git submodule for conlict-related files 2017-10-12 22:03:15 -03:00
resolution.rb Simplify conflict resolution interface and code 2018-01-02 16:22:02 -03:00
resolver.rb Simplify conflict resolution interface and code 2018-01-02 16:22:02 -03:00