Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Repository
d92bd8e2a5ca13d8aac58eab72e715ce792f13fb
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
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.
