Closed sbejaoui closed 1 year ago
What a great day to merge this nice PR. Let's do it! Prepared branch 16.0-ocabot-merge-pr-102-by-jbaudoux-bump-patch, awaiting test results.
It looks like something changed on 16.0
in the meantime.
Let me try again (no action is required from you).
Prepared branch 16.0-ocabot-merge-pr-102-by-jbaudoux-bump-patch, awaiting test results.
@jbaudoux The merge process could not start, because command git push origin 16.0-ocabot-merge-pr-102-by-jbaudoux-bump-patch
failed with output:
To https://github.com/OCA/stock-logistics-transport
! [rejected] 16.0-ocabot-merge-pr-102-by-jbaudoux-bump-patch -> 16.0-ocabot-merge-pr-102-by-jbaudoux-bump-patch (fetch first)
error: failed to push some refs to 'https://***@github.com/OCA/stock-logistics-transport'
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.
@jbaudoux The merge process could not be finalized, because command git push origin 16.0-ocabot-merge-pr-102-by-jbaudoux-bump-patch
failed with output:
To https://github.com/OCA/stock-logistics-transport
! [rejected] 16.0-ocabot-merge-pr-102-by-jbaudoux-bump-patch -> 16.0-ocabot-merge-pr-102-by-jbaudoux-bump-patch (fetch first)
error: failed to push some refs to 'https://***@github.com/OCA/stock-logistics-transport'
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.
It looks like something changed on 16.0
in the meantime.
Let me try again (no action is required from you).
Prepared branch 16.0-ocabot-merge-pr-102-by-jbaudoux-bump-patch, awaiting test results.
Congratulations, your PR was merged at 7353764bce6d084f0cbb7f3bac9ca886d4f30bf7. Thanks a lot for contributing to OCA. ❤️
/ocabot merge patch