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
Léo-Paul Géneau
gitlab-ce
Repository
You need to sign in or sign up before continuing.
351f205c0580e43ace9d5a47e0b923ffb7cda3b8
Switch branch/tag
gitlab-ce
lib
gitlab
gitaly_client
conflicts_service.rb
Find file
Blame
History
Permalink
Incorporate ConflictsService.ListConflictFiles Gitaly RPC
· 351f205c
Alejandro Rodríguez
authored
Dec 05, 2017
351f205c
conflicts_service.rb
1.7 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.
