search

OrchardCMS / OrchardCore

Orchard Core is an open-source modular and multi-tenant application framework built with ASP.NET Core, and a content management system (CMS) built on top of that framework.
https://orchardcore.net
BSD 3-Clause "New" or "Revised" License
7.45k stars 2.41k forks source link

Update package version #17018

Closed sebastienros closed 4 days ago

sebastienros commented 1 week ago
github-actions[bot] commented 4 days ago

This pull request has merge conflicts. Please resolve those before requesting a review.

MikeAlhayek commented 5 hours ago

/backport to release/2.1

github-actions[bot] commented 5 hours ago

Started backporting to release/2.1: https://github.com/OrchardCMS/OrchardCore/actions/runs/12016454683

github-actions[bot] commented 5 hours ago

@MikeAlhayek backporting to release/2.1 failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Update package version
Using index info to reconstruct a base tree...
M   Directory.Packages.props
Falling back to patching base and 3-way merge...
Auto-merging Directory.Packages.props
CONFLICT (content): Merge conflict in Directory.Packages.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Update package version
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

github-actions[bot] commented 5 hours ago

@MikeAlhayek an error occurred while backporting to release/2.1, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.