Skip to content

fix: preserve trailing newlines in text-based 3-way merges #26922

fix: preserve trailing newlines in text-based 3-way merges

fix: preserve trailing newlines in text-based 3-way merges #26922

This workflow is awaiting approval from a maintainer in #2891
Triggered via pull request August 6, 2026 16:09
Status Action required
Total duration
Artifacts
This workflow is awaiting approval from a maintainer in #2891

test.yml

on: pull_request
Matrix: build
Waiting for pending jobs
Matrix: kubernetes-e2e
Waiting for pending jobs
Matrix: k3s
Waiting for pending jobs
Matrix: test
Waiting for pending jobs
Matrix: floci
Waiting for pending jobs
Matrix: lint
Waiting for pending jobs
Matrix: mock
Waiting for pending jobs
Matrix: validate
Waiting for pending jobs
[container-step] example
[container-step] example
[floci] go e2e
[floci] go e2e
[lint] Dockerfile
[lint] Dockerfile
Validation (affected)
Validation (affected)
[hooks-tflint] example
[hooks-tflint] example
[k3s] demo-helmfile
[k3s] demo-helmfile
Upload acceptance coverage to Codecov
Upload acceptance coverage to Codecov
release  /  ...  /  release
release / draft / release
release  /  goreleaser
release / goreleaser
release  /  ...  /  release
release / publish / release
Fit to window
Zoom out
Zoom in