Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Privacy
Imprint
Contact
Sign in
Toggle navigation
Menu
projects.thm.de
GitLab FOSS
Repository
gitlab
app
models
merge_request.rb
Find file
Blame
History
Permalink
Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'
· e4261fe3
Douwe Maan
authored
May 12, 2017
Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298
e4261fe3