Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Boxiang Sun
gitlab-ce
Repository
57fc7cd8f35525f772d7c59a2aa45c96467cb882
Switch branch/tag
gitlab-ce
lib
gitlab
gitaly_client
conflicts_service.rb
Find file
Blame
History
Permalink
Make sure ConflictsService does not raise for conflicting submodules
· 57fc7cd8
Sean McGivern
authored
Jul 10, 2018
57fc7cd8
conflicts_service.rb
2.68 KB
Edit
Web IDE
Replace conflicts_service.rb
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace conflicts_service.rb
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
