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
Léo-Paul Géneau
gitlab-ce
Repository
197ac5ebbfd8ca7fbcb79776fd25ca0e213376c4
Switch branch/tag
gitlab-ce
spec
features
merge_requests
conflicts_spec.rb
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
conflicts_spec.rb
4.44 KB
Edit
Web IDE
Replace conflicts_spec.rb
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace conflicts_spec.rb
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
