Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
gitlab-foss
app
models
repository.rb
Find file
Blame
History
Permalink
Merge branch 'conflict-resolution-refactor' into 'master'
· b2553840
Sean McGivern
authored
Oct 16, 2017
Conflict resolution refactor See merge request gitlab-org/gitlab-ce!14747
b2553840