Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Oct 5, 2021

Forward-Port-Of: #1161
Forward-Port-Of: #1157

@robodoo
Copy link
Collaborator

robodoo commented Oct 5, 2021

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 5, 2021

Ping @AntoineVDV cherrypicking of pull request #1157 failed.

stderr:

16:57:28.923098 git.c:344               trace: built-in: git cherry-pick 11d389411385af44132255751d123bb588dff660
error: could not apply 11d38941... [REL] supported_versions: update list of versions and add end of support
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
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 AntoineVDV force-pushed the 15.0-13.0-update_supported_versions-anv-F9V0-fw branch from ddc9dd4 to bbf58e0 Compare October 5, 2021 15:13
@AntoineVDV
Copy link
Collaborator

@robodoo r+

@robodoo robodoo closed this in b28e34b Oct 5, 2021
@robodoo robodoo temporarily deployed to merge October 5, 2021 15:22 Inactive
@fw-bot fw-bot deleted the 15.0-13.0-update_supported_versions-anv-F9V0-fw branch October 19, 2021 15:46
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