From e9edfcd11aaaf8371b2fe239c7e2746df8f0f857 Mon Sep 17 00:00:00 2001 From: Eric Downing Date: Tue, 29 Sep 2026 21:58:30 -0700 Subject: [PATCH] fixed --- agone_jenkins | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/agone_jenkins b/agone_jenkins index 1124b91..8d8b13e 100644 --- a/agone_jenkins +++ b/agone_jenkins @@ -74,13 +74,9 @@ bazel build --spawn_strategy=standalone //:run steps { script { echo "Starting agone-pr build..." - echo "The current branch is: ${env.BRANCH_NAME}" -<<<<<<< HEAD -======= - ->>>>>>> origin/pullone // 1. Determine target branch and fetch changes def targetBranch = env.CHANGE_TARGET ?: 'main' + echo "The current branch is: ${env.BRANCH_NAME}" sh "git fetch origin ${targetBranch}" // 2. Identify changed files relative to the target branch