Skip to content
Continuous Integration

Change keybinding of "keep" item in Merge Conflict menu back to 'k' #8311

Sign in to view logs

Change keybinding of "keep" item in Merge Conflict menu back to 'k'

Change keybinding of "keep" item in Merge Conflict menu back to 'k' #8311

Triggered via pull request December 22, 2025 08:49
@stefanhallerstefanhaller
synchronize #5132
use-k-keybinding-for-keep-in-resolve-conflict-menu
Status Success
Total duration 2m 41s
Artifacts 6

ci.yml

on: pull_request
Matrix: integration-tests
Matrix: unit-tests
build
1m 21s
build
check-codebase
25s
check-codebase
lint
46s
lint
check-for-fixups
4s
check-for-fixups
upload-coverage
24s
upload-coverage
Fit to window
Zoom out
Zoom in

Artifacts

Produced during runtime
Name Size Digest
coverage-integration-2.32.0-20426722674
280 KB
sha256:f2fe157d891954a9d89aed8ba923ebaed6cca48d31fcff0c04645bf45fb47578
coverage-integration-2.38.2-20426722674
281 KB
sha256:8b7a8e1209eb5af239588e3f86668f0c4c37471c5d534de08031890eb5ee5af6
coverage-integration-2.44.0-20426722674
281 KB
sha256:1611b144a58c3b7909bf95363f586210e77a6f1a0ef0e3ef1b9953e7c5385ccf
coverage-integration-latest-20426722674
281 KB
sha256:dc3dd1253ece8e6976d85351c20f1971252bf3a9a26560810f56a67307b9f39a
coverage-unit-ubuntu-latest-20426722674
224 KB
sha256:4d3ad65bfe7e557f5afb1b4e4e6a509d9d2d48b772217ad65070a9f400905e85
coverage-unit-windows-latest-20426722674
187 KB
sha256:806f85e8b6d0dcacfe40a68acaa344ff3008eb146d3726e7a6a5eb48c48044f8