[go: up one dir, main page]

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 Edit inline mode

Test metadata

Field Value
File URL spec/features/merge_request/user_resolves_conflicts_spec.rb#L123
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 Edit inline mode
Test level system
Hash f411159f9b64cb8820fdbf0e0ca2bd021fac76174
Max expected duration < 50.13 seconds