Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
GitLab.org
GitLab FOSS
Repository
gitlab-foss
lib
gitlab
git
conflict_file.rb
Find file
Blame
History
Permalink
Refactor conflict resolution to contain git ops within Gitlab::Git
· 3fcab51e
Alejandro Rodríguez
authored
Oct 06, 2017
This prepares the codebase for a Gitaly migration. See
gitaly#553
3fcab51e