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
197ac5ebbfd8ca7fbcb79776fd25ca0e213376c4
Switch branch/tag
gitlab-ce
spec
features
merge_requests
conflicts_spec.rb
Find file
Blame
History
Permalink
Ability to resolve conflicts for files with `text-editor` as conflict type
· 197ac5eb
Alfredo Sumaran
authored
Sep 29, 2016
197ac5eb
conflicts_spec.rb
4.44 KB
Edit
Web IDE
×
Replace conflicts_spec.rb
Attach a file by drag & drop or
click to upload
Commit message
Replace conflicts_spec.rb
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
