Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Aug 3, 2021

task-2613841

Forward-Port-Of: #1079

@robodoo
Copy link
Collaborator

robodoo commented Aug 3, 2021

@fw-bot
Copy link
Collaborator Author

fw-bot commented Aug 3, 2021

Ping @Donapi, @AntoineVDV
Cherrypicking 65cfe5e of source #1079 failed

stderr:

15:46:54.670647 git.c:344               trace: built-in: git cherry-pick 65cfe5e75ed06b80869775040655324a9da3b243
error: could not apply 65cfe5e7... [REM] developer/upgrade: remove outdated page
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 13.0-12.0-remove_upgrade_page-dopi-uuKz-fw branch 2 times, most recently from 8a8b79b to 7a552de Compare August 3, 2021 14:02
@AntoineVDV AntoineVDV force-pushed the 13.0-12.0-remove_upgrade_page-dopi-uuKz-fw branch from 7a552de to 8be520b Compare August 3, 2021 14:06
@AntoineVDV
Copy link
Collaborator

@robodoo r+

robodoo pushed a commit that referenced this pull request Aug 3, 2021
task-2613841

closes #1080

X-original-commit: 7af926e
Signed-off-by: Antoine Vandevenne (anv) <AntoineVDV@users.noreply.github.com>
@robodoo robodoo closed this Aug 3, 2021
@robodoo robodoo temporarily deployed to merge August 3, 2021 14:26 Inactive
@fw-bot fw-bot deleted the 13.0-12.0-remove_upgrade_page-dopi-uuKz-fw branch August 17, 2021 14: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.

4 participants