Tutor lilac build failed in cherry pick step. getting error The previous cherry-pick is now empty, possibly due to conflict resolution

 => ERROR [code 4/5] RUN git fetch --depth=2 https://github.com/edx/edx-platform d61dcac29d1651956623c150be53a8bbe69e9346   && git cherry-pick d61dcac29d1651956623c  35.3s
------
[code 4/5] RUN git fetch --depth=2 https://github.com/edx/edx-platform d61dcac29d1651956623c150be53a8bbe69e9346   && git cherry-pick d61dcac29d1651956623c150be53a8bbe69e9346:
4.691 warning: no common commits
31.26 From https://github.com/edx/edx-platform
31.26  * branch              d61dcac29d1651956623c150be53a8bbe69e9346 -> FETCH_HEAD
Performing inexact rename detection: 100% (640152/640152), done.
34.51 Auto-merging requirements/edx/development.txt
34.51 Auto-merging requirements/edx/base.txt
35.25 Not currently on any branch.
35.25 You are currently cherry-picking commit d61dcac2.
35.25   (all conflicts fixed: run "git cherry-pick --continue")
35.25   (use "git cherry-pick --skip" to skip this patch)
35.25   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
35.25
35.25 nothing to commit, working tree clean
35.25 The previous cherry-pick is now empty, possibly due to conflict resolution.
35.25 If you wish to commit it anyway, use:
35.25
35.25     git commit --allow-empty
35.25
35.25 Otherwise, please use 'git cherry-pick --skip'
------
Dockerfile:45
--------------------
  44 |     # edx-proctoring security fix https://github.com/edx/edx-platform/pull/29347/
  45 | >>> RUN git fetch --depth=2 https://github.com/edx/edx-platform d61dcac29d1651956623c150be53a8bbe69e9346 \
  46 | >>>   && git cherry-pick d61dcac29d1651956623c150be53a8bbe69e9346
  47 |     # Fix "from" address in course bulk emails
--------------------
ERROR: failed to solve: process "/bin/sh -c git fetch --depth=2 https://github.com/edx/edx-platform d61dcac29d1651956623c150be53a8bbe69e9346   && git cherry-pick d61dcac29d1651956623c150be53a8bbe69e9346" did not complete successfully: exit code: 1
Error: Command failed with status 1: docker build -t docker.io/overhangio/openedx:12.2.0 --build-arg EDX_PLATFORM_REPOSITORY=https://***:ghp_***@github.hpe.com/hpe/techadmy.git --build-arg EDX_PLATFORM_VERSION=012102023-3/lilac.master /home/ruut/.local/share/tutor/env/build/openedx