Showing logs for build greencapitaltrade/pepper/pr-1005 #2 stage from-build-pack and container prepare
2026/07/30 15:20:38 Entrypoint initialization

Showing logs for build greencapitaltrade/pepper/pr-1005 #2 stage from-build-pack and container place-scripts
2026/07/30 15:20:39 Decoded script /tekton/scripts/script-0-nxtt4
2026/07/30 15:20:39 Decoded script /tekton/scripts/script-1-br9qw
2026/07/30 15:20:39 Decoded script /tekton/scripts/script-2-6rcqp
2026/07/30 15:20:39 Decoded script /tekton/scripts/script-3-h2kcg
2026/07/30 15:20:39 Decoded script /tekton/scripts/script-4-fxzmv
2026/07/30 15:20:39 Decoded script /tekton/scripts/script-5-pvgsh
2026/07/30 15:20:39 Decoded script /tekton/scripts/script-6-c47np
2026/07/30 15:20:39 Decoded script /tekton/scripts/script-8-zxg2p
2026/07/30 15:20:39 Decoded script /tekton/scripts/script-9-g2tlc

Showing logs for build greencapitaltrade/pepper/pr-1005 #2 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/pepper/pr-1005 #2 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/pepper.git version refs/pull/1005/head:PR-1005@068ad5c79a973b639bdd575921e06c88624b4410 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/pepper
 * [new ref]               refs/pull/1005/head -> PR-1005
Switched to branch 'PR-1005'
HEAD is now at 068ad5c79a perf(ci): take a single kaniko snapshot instead of one per layer
checked out revision: refs/pull/1005/head:PR-1005@068ad5c79a973b639bdd575921e06c88624b4410 to dir: source

Showing logs for build greencapitaltrade/pepper/pr-1005 #2 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:27eacc46e69a5f3ec90008618a7d4d60d6d6c32f,1005:068ad5c79a973b639bdd575921e06c88624b4410:refs/pull/1005/head
using base branch main and base sha 27eacc46e69a5f3ec90008618a7d4d60d6d6c32f
merging sha: 068ad5c79a973b639bdd575921e06c88624b4410
error: error during merge: merging 068ad5c79a973b639bdd575921e06c88624b4410 into main: failed to run 'git merge 068ad5c79a973b639bdd575921e06c88624b4410' command in directory '.', output: 'Auto-merging .lighthouse/jenkins-x/pullrequest.yaml
Auto-merging .lighthouse/jenkins-x/release.yaml
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
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.