Jenkins pipeline failling to merge with the master branch

Viewed 18

when i try to merge the release to master im having this error on the logs and the version that is going to prod its a old version (the last master version that i manually merged)

***[Pipeline] { (Merge to Master)
[Pipeline] sh
+ git clean -f -d
Removing .docker/
Removing deploy/prod/
[Pipeline] sh
+ git reset --hard
HEAD is now at 0268702 updating version to 1.8.0
[Pipeline] sh
+ git checkout origin/master
Previous HEAD position was 0268702 updating version to 1.8.0
HEAD is now at e72f5f9 Merge pull request #143 from customer/develop
[Pipeline] sh
+ git rebase user-permission-manager-api-1.8.0
                                                                                
Successfully rebased and updated detached HEAD.
[Pipeline] sh
+ git push origin HEAD:master
To github.com:ps-customer/user-permission-manager-api.git
 ! [rejected]        HEAD -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:ps-customer/user-permission-manager-api.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
[Pipeline] sh"***
0 Answers
Related