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
nexedi
gitlab-ce
Repository
a3859c0f09f28301c53bd73435c8db152c55f8b6
Switch branch/tag
gitlab-ce
spec
features
merge_request
user_resolves_conflicts_spec.rb
Find file
Blame
History
Permalink
Make it explicit that merge conflict feature commits to source branch
· 06a2e385
Annabel Dunstone Gray
authored
May 11, 2018
06a2e385
user_resolves_conflicts_spec.rb
6.67 KB
Edit
Web IDE
Replace user_resolves_conflicts_spec.rb
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace user_resolves_conflicts_spec.rb
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
