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
da07c2e4d3d382c05ec287ee60f639b870074fe7
Switch branch/tag
gitlab-ce
app
assets
javascripts
merge_conflict_resolver.js.es6
Find file
Blame
History
Permalink
ensure the 'fixed layout' preference is honored whenever possible
· 76ae5af8
Mike Greiling
authored
Sep 19, 2016
see #22343 for issue description
76ae5af8
merge_conflict_resolver.js.es6
1.94 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.
