Closed grindtildeath closed 5 months ago
/ocabot merge patch
What a great day to merge this nice PR. Let's do it! Prepared branch 16.0-ocabot-merge-pr-185-by-gurneyalex-bump-patch, awaiting test results.
@gurneyalex The merge process could not be finalized, because command git push origin 16.0-ocabot-merge-pr-185-by-gurneyalex-bump-patch:16.0
failed with output:
To https://github.com/OCA/server-env
! [rejected] 16.0-ocabot-merge-pr-185-by-gurneyalex-bump-patch -> 16.0 (fetch first)
error: failed to push some refs to 'https://***@github.com/OCA/server-env'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first 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.
Congratulations, your PR was merged at 079d742470c017079221c6478d917c5b37fdfdfe. Thanks a lot for contributing to OCA. ❤️
FW port of https://github.com/OCA/server-env/pull/184