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
Jérome Perrin
gitlab-ce
Repository
14a4b17d1c8a43c77b0459fd543be36838031610
Switch branch/tag
gitlab-ce
lib
gitlab
conflict
file.rb
Find file
Blame
History
Permalink
Allow resolving conflicts in MR controller
· 14a4b17d
Sean McGivern
authored
Jul 27, 2016
14a4b17d
file.rb
4.17 KB
Edit
Web IDE
Replace file.rb
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace file.rb
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.