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
dc46ae6b71d375ec46b7efc53d5099a78313d95b
Switch branch/tag
gitlab-ce
doc
user
project
merge_requests
resolve_conflicts.md
Find file
Blame
History
Permalink
Improve detail of resolve conflict docs
· 1b7ecba0
James Ramsay
authored
Nov 08, 2018
1b7ecba0
resolve_conflicts.md
2.99 KB
Edit
Web IDE
Replace resolve_conflicts.md
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace resolve_conflicts.md
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
