Skip to content
CI

fix: merge conflicts with deletes etc display as merge conflict too #1937

Sign in to view logs

fix: merge conflicts with deletes etc display as merge conflict too

fix: merge conflicts with deletes etc display as merge conflict too #1937

Triggered via push November 14, 2025 22:08
@isc-pbartonisc-pbarton
pushed 284b5d3
fix-diff-unmerged
Status Success
Total duration 1m 34s
Artifacts 2

main.yml

on: push
build
1m 29s
build
Fit to window
Zoom out
Zoom in

Annotations

3 warnings
build
The `set-output` command is deprecated and will be disabled soon. Please upgrade to using Environment Files. For more information see: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
build
The `set-output` command is deprecated and will be disabled soon. Please upgrade to using Environment Files. For more information see: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
build
The `set-output` command is deprecated and will be disabled soon. Please upgrade to using Environment Files. For more information see: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/

Artifacts

Produced during runtime
Name Size Digest
PreIRISInstallationPackage
1.11 MB
sha256:0711ac167380a3a44f240da06fb59df88dfe4801cf5ac5a43ade1b6f520f1d52
test-results-intersystems-git-source-control-CI-x86_64-19378944251
724 KB
sha256:e2e2003104185264aff9ef88c2f100e5cd6a4fc1139af6d21dad8ed6af6ff071