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
e9c14918e51828dfbfa2879d5a04f74d08fae290
Switch branch/tag
gitlab-ce
app
views
projects
merge_requests
conflicts
_file_actions.html.haml
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
_file_actions.html.haml
539 Bytes
Edit
Web IDE
×
Replace _file_actions.html.haml
Attach a file by drag & drop or
click to upload
Commit message
Replace _file_actions.html.haml
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
