Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Privacy
Imprint
Contact
Login methods
Sign in
Toggle navigation
Menu
Open sidebar
projects.thm.de
GitLab FOSS
Repository
e4261fe3ce0e6ba38db99323b9fb479c6a182d77
Switch branch/tag
gitlab
spec
models
merge_request_spec.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