Showing logs for build greencapitaltrade/coulson/pr-106 #5 stage from-build-pack and container prepare
2026/11/05 09:39:31 Entrypoint initialization

Showing logs for build greencapitaltrade/coulson/pr-106 #5 stage from-build-pack and container place-scripts
2026/11/05 09:39:37 Decoded script /tekton/scripts/script-0-p4tzk
2026/11/05 09:39:37 Decoded script /tekton/scripts/script-1-dm7s8
2026/11/05 09:39:37 Decoded script /tekton/scripts/script-2-9gmvj
2026/11/05 09:39:37 Decoded script /tekton/scripts/script-3-jjwrw
2026/11/05 09:39:37 Decoded script /tekton/scripts/script-4-q4pjz
2026/11/05 09:39:37 Decoded script /tekton/scripts/script-6-dtj4v
2026/11/05 09:39:37 Decoded script /tekton/scripts/script-7-cw6mz

Showing logs for build greencapitaltrade/coulson/pr-106 #5 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/coulson/pr-106 #5 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/coulson.git version refs/pull/106/head:PR-106@0c47c28d1fba68ebecee664774375c2bb591b7f9 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/coulson
 * [new ref]         refs/pull/106/head -> PR-106
Switched to branch 'PR-106'
HEAD is now at 0c47c28 fix: configure source lint and import legacy upload builtins
checked out revision: refs/pull/106/head:PR-106@0c47c28d1fba68ebecee664774375c2bb591b7f9 to dir: source

Showing logs for build greencapitaltrade/coulson/pr-106 #5 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:85659634f78af8e205567b02cf7698037cf12ab9,106:0c47c28d1fba68ebecee664774375c2bb591b7f9:refs/pull/106/head
using base branch main and base sha 85659634f78af8e205567b02cf7698037cf12ab9
merging sha: 0c47c28d1fba68ebecee664774375c2bb591b7f9
error: error during merge: merging 0c47c28d1fba68ebecee664774375c2bb591b7f9 into main: failed to run 'git merge 0c47c28d1fba68ebecee664774375c2bb591b7f9' command in directory '.', output: 'Auto-merging charts/coulson/values.yaml
Auto-merging models/file.js
CONFLICT (content): Merge conflict in models/file.js
Auto-merging preview/helmfile.yaml.gotmpl
CONFLICT (content): Merge conflict in preview/helmfile.yaml.gotmpl
Auto-merging preview/values.yaml.gotmpl
Auto-merging routes/files.js
CONFLICT (content): Merge conflict in routes/files.js
Auto-merging tests/files.test.js
CONFLICT (content): Merge conflict in tests/files.test.js
Automatic merge failed; fix conflicts and then commit the result.'

Pipeline failed on stage 'from-build-pack' : container 'step-git-merge'. The execution of the pipeline has stopped.