Deployment #551

← Back to List

Repository:

Yimaru/Yimaru-BackEnd

Branch:

production

Commit:

3a959cd563c925869663958fa7cb41342a8a9971

Status:

failed

Created At:

8/24/2026, 2:33:12 PM

Commands (5)

git stash save "local changes 2026-08-24T14:33:12.785Z"

Success Exit: 0

Output:

No local changes to save

git reset --hard HEAD

Success Exit: 0

Output:

HEAD is now at 0dea672 xMerge remote-tracking branch 'origin/production' into production

git fetch https://***:***@gitea.yaltopia.com/Yimaru/Yimaru-BackEnd.git production

Success Exit: 0

Error:

From https://gitea.yaltopia.com/Yimaru/Yimaru-BackEnd
 * branch            production -> FETCH_HEAD

git checkout production

Success Exit: 0

Output:

Your branch is ahead of 'origin/production' by 3 commits.
  (use "git push" to publish your local commits)

Error:

Already on 'production'

git pull https://***:***@gitea.yaltopia.com/Yimaru/Yimaru-BackEnd.git production

Failed Exit: 128

Error:

From https://gitea.yaltopia.com/Yimaru/Yimaru-BackEnd
 * branch            production -> FETCH_HEAD
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint:   git config pull.rebase false  # merge
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.