Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Sep 14, 2021

Forward-Port-Of: #1126

@robodoo
Copy link
Collaborator

robodoo commented Sep 14, 2021

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 14, 2021

Ping @AntoineVDV cherrypicking of pull request #1126 failed.

stdout:

On branch saas-14.5-12.0-hide_saas_branches-anvfe-iiep-fw
You are currently cherry-picking commit 708382a6.

nothing to commit, working tree clean

stderr:

10:32:01.075474 git.c:344               trace: built-in: git cherry-pick 708382a6c694335a5e745004eb1a164b03eb89ba
10:32:03.848347 run-command.c:646       trace: run_command: git commit -n -F .git/MERGE_MSG --cleanup=verbatim
10:32:03.852599 git.c:344               trace: built-in: git commit -n -F .git/MERGE_MSG --cleanup=verbatim
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 reset'
----------
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.

@AntoineVDV
Copy link
Collaborator

Already done in saas-14.5.

@AntoineVDV AntoineVDV closed this Sep 14, 2021
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