Skip to content

[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 Parallel view mode conflicts are resolved in Interactive mode

Test metadata

Field Value
File URL spec/features/merge_request/user_resolves_conflicts_spec.rb#L122
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 Parallel view mode conflicts are resolved in Interactive mode
Test level system
Hash 1dd3a98f06a0d810555262171f34704177ee263e4
Max expected duration < 50.13 seconds