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
nexedi
gitlab-ce
Repository
ad663560a7294acd36c22ba488a790fff95b49e0
Switch branch/tag
gitlab-ce
lib
gitlab
gitaly_client
conflicts_service.rb
Find file
Blame
History
Permalink
GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side
· 0b965528
Ahmad Sherif
authored
Jan 23, 2018
0b965528
conflicts_service.rb
2.54 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.
