Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented May 2, 2023

This reverts commit 29b3313. The reason is this commit should deploy together with odoo/odoo#120050.

Forward-Port-Of: #4304

This reverts commit 29b3313.
The reason is this commit should deploy together with odoo/odoo#120050.

X-original-commit: 7bdc313
@robodoo
Copy link
Collaborator

robodoo commented May 2, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented May 2, 2023

@tong-odoo @AntoineVDV cherrypicking of pull request #4304 failed.

stdout:

On branch saas-16.1-16.0-l10n_hk-tong-revert-x8DW-fw
You are currently cherry-picking commit f3937655b.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

stderr:

15:38:29.039096 git.c:455               trace: built-in: git cherry-pick f3937655bd2f79d055d21a34a66da9909521f268
15:38:29.054329 run-command.c:668       trace: run_command: git commit -n --no-gpg-sign -F .git/MERGE_MSG --cleanup=verbatim --allow-empty-message
15:38:29.055948 git.c:455               trace: built-in: git commit -n --no-gpg-sign -F .git/MERGE_MSG --cleanup=verbatim --allow-empty-message
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

@tong-odoo tong-odoo closed this May 6, 2023
@tong-odoo tong-odoo deleted the saas-16.1-16.0-l10n_hk-tong-revert-x8DW-fw branch May 6, 2023 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants