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
Boxiang Sun
gitlab-ce
Repository
822534c4c4c05cc53606fc45ca002d4a3d218256
Switch branch/tag
gitlab-ce
..
open
_conflicts.html.haml
Find file
Blame
History
Permalink
Replace link to Resolve conflicts with buttons
· 822534c4
Sam Rose
authored
Dec 21, 2016
Use variables for display logic conditional checks
822534c4
_conflicts.html.haml
918 Bytes
Edit
Web IDE
Replace _conflicts.html.haml
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace _conflicts.html.haml
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
