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
8b6a075e6ff3197ee984c3d21395e1e26bc3bb15
Switch branch/tag
gitlab-ce
app
assets
javascripts
merge_conflict_resolver.js.es6
Find file
Blame
History
Permalink
Implement commit in merge conflicts UI.
· 8b6a075e
Fatih Acet
authored
Aug 02, 2016
8b6a075e
merge_conflict_resolver.js.es6
1.46 KB
Edit
Web IDE
Replace merge_conflict_resolver.js.es6
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace merge_conflict_resolver.js.es6
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.