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
0aa87bbe13ca74a791bf5c70a12d8e7f6876fd5a
Switch branch/tag
gitlab-ce
lib
gitlab
git
conflict
resolver.rb
Find file
Blame
History
Permalink
Incorporate ConflictsService.ResolveConflicts Gitaly RPC
· 0aa87bbe
Alejandro Rodríguez
authored
Dec 05, 2017
0aa87bbe
resolver.rb
4.42 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.
