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
Kirill Smelkov
gitlab-ce
Repository
ca725aaf4ca7cb300c50d539fe27efc45a32dfd6
Switch branch/tag
gitlab-ce
CHANGELOG
Find file
Blame
History
Permalink
resolve merge conflict
· ca725aaf
James Lopez
authored
Apr 15, 2016
ca725aaf
To find the state of this project's repository at the time of any of these versions, check out
the tags
..
CHANGELOG
129 KB
Edit
Web IDE
Replace CHANGELOG
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace CHANGELOG
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.