[Test] spec/features/merge_request/user_resolves_conflicts_spec.rb | Merge request > User resolves conflicts can be resolved in the UI the conflicts are resolvable in Inline view mode conflicts are resolved in Edit inline mode
Test metadata
Field | Value |
---|---|
File URL | spec/features/merge_request/user_resolves_conflicts_spec.rb#L113 |
Filename | spec/features/merge_request/user_resolves_conflicts_spec.rb |
Description | Merge request > User resolves conflicts can be resolved in the UI the conflicts are resolvable in Inline view mode conflicts are resolved in Edit inline mode |
Test level | system |
Hash | 2be676d2355a6d99ee6f315af9b1d3fc034ed7ea4 |
Max expected duration | < 50.13 seconds |
Edited by TEST_FAILURES_PROJECT_TOKEN