BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Repository
351f205c0580e43ace9d5a47e0b923ffb7cda3b8
Switch branch/tag
gitlab-ce
lib
gitlab
git
conflict
resolver.rb
Find file
Blame
History
Permalink
Incorporate ConflictsService.ListConflictFiles Gitaly RPC
· 351f205c
Alejandro Rodríguez
authored
Dec 05, 2017
351f205c
resolver.rb
3.76 KB
Edit
Web IDE
×
Replace resolver.rb
Attach a file by drag & drop or
click to upload
Commit message
Replace resolver.rb
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
