Closed GabbasovDinar closed 1 month ago
Congratulations, PR rebased to 14.0-dev.
This PR has the approved
label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖
/ocabot rebase
Congratulations, PR rebased to 14.0-dev.
Code review LGTM
/ocabot rebase
@GabbasovDinar The rebase process failed, because command git rebase origin/14.0-dev
failed with output:
Rebasing (1/6)
Auto-merging cetmix_tower_server/README.rst
Auto-merging cetmix_tower_server/models/cx_tower_plan.py
Auto-merging cetmix_tower_server/readme/CONFIGURE.md
CONFLICT (content): Merge conflict in cetmix_tower_server/readme/CONFIGURE.md
Auto-merging cetmix_tower_server/static/description/index.html
Auto-merging cetmix_tower_server/tests/test_plan.py
error: could not apply d9ba732... [IMP] cetmix_tower_server:t3675 Allow execute condition for plan line
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply d9ba732... [IMP] cetmix_tower_server:t3675 Allow execute condition for plan line
/ocabot merge nobump
What a great day to merge this nice PR. Let's do it! Prepared branch 14.0-dev-ocabot-merge-pr-78-by-ivs-cetmix-bump-nobump, awaiting test results.
Congratulations, your PR was merged at 3619a1b36d81080ea25220a5e456a37e4272a4eb. Thanks a lot for contributing to cetmix. ❤️
/ocabot rebase