Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Repository
c6660e61b267dafe7e4f6ce2b4e38b644e7b2177
Switch branch/tag
gitlab-ce
spec
features
merge_request
user_resolves_conflicts_spec.rb
Find file
Blame
History
Permalink
Re-enables merge conflicts resolution spec
· ea1f3882
Phil Hughes
authored
Sep 10, 2018
https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
ea1f3882
user_resolves_conflicts_spec.rb
6.76 KB
Edit
Web IDE
Replace user_resolves_conflicts_spec.rb
×
Attach a file by drag & drop or
click to upload
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.
