merge_tools: add merge-tool-conflict-exit-codes option #5857

Sign in to view logs

Triggered via pull request December 4, 2024 01:39

scott2000

synchronize #4981

scott2000:merge-tool-error-status-on-conflict

Status Success

Total duration 6m 27s

Artifacts –

build-nix.yml

on: pull_request

Matrix: flake check

Annotations

1 warning

flake check (ubuntu-latest)

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