Skip to content

Conversation

@fw-bot
Copy link
Collaborator

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

task-3329454
fw-port of #4444

Forward-Port-Of: #4451

@robodoo
Copy link
Collaborator

robodoo commented May 17, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented May 17, 2023

@jcs-odoo cherrypicking of pull request #4451 failed.

stdout:

On branch saas-16.3-saas-16.2-saltedge-ww-jcs-romA-fw
You are currently cherry-picking commit 29622451b.
  (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:

17:15:20.609598 git.c:455               trace: built-in: git cherry-pick 29622451bb91bd6ba31847ebc0a49e1ebac839ba
17:15:20.623332 run-command.c:668       trace: run_command: git commit -n --no-gpg-sign -F .git/MERGE_MSG --cleanup=verbatim --allow-empty-message
17:15:20.624980 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.

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