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
2436631dea9264045d8694705a95d90c30b4057d
Switch branch/tag
gitlab-ce
lib
gitlab
conflict
file.rb
Find file
Blame
History
Permalink
Handle case where conflicts aren't on disk yet
· 4a3d1a58
Sean McGivern
authored
Aug 24, 2016
4a3d1a58
file.rb
6.73 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.
