Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Repository
ab44aa7b34e85b498d5aba02e5ad902d6d16fe7f
Switch branch/tag
gitlab-ce
doc
user
project
merge_requests
img
conflict_section.png
Find file
History
Permalink
Add merge conflict docs
· b79378ca
Sean McGivern
authored
Aug 05, 2016
b79378ca
conflict_section.png
242 KB
Download (242 KB)
Replace conflict_section.png
×
Attach a file by drag & drop or
click to upload
Commit message
Replace conflict_section.png
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
