Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
nexedi
gitlab-ce
Repository
905bd0fe15510f0d294111db69b91f9fc28166e2
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
Web IDE
Download (242 KB)
Replace conflict_section.png
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || 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.
