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
78c52a3a9bbb5e273e77feaf5ecf84140a938f8d
Switch branch/tag
gitlab-ce
doc
user
project
merge_requests
img
merge_conflict_editor.png
Find file
History
Permalink
Add docs for resolve conflicts editor
· b72f43d0
...
Achilleas Pipinellis
authored
Jan 24, 2017
[ci skip]
b72f43d0
merge_conflict_editor.png
49.2 KB
Download (49.2 KB)
×
Replace merge_conflict_editor.png
Attach a file by drag & drop or
click to upload
Commit message
Replace merge_conflict_editor.png
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
