Skip to content

Improving diff3 conflict quality -- reducing the prevalence of nested conflicts with recursive merges #4871

Improving diff3 conflict quality -- reducing the prevalence of nested conflicts with recursive merges

Improving diff3 conflict quality -- reducing the prevalence of nested conflicts with recursive merges #4871

Triggered via pull request January 21, 2025 16:41
Status Success
Total duration 49s
Artifacts

check-whitespace.yml

on: pull_request
check-whitespace
36s
check-whitespace
Fit to window
Zoom out
Zoom in

Annotations

1 warning
check-whitespace
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636