Skip to content

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented May 1, 2025

This PR contains automatic updates to the site package files generated by the script.

@linawolf linawolf merged commit 3334c2d into main May 1, 2025
1 check passed
@linawolf linawolf deleted the auto/sitepackage-update-1746067127 branch May 1, 2025 06:47
@github-actions
Copy link
Contributor Author

github-actions bot commented May 1, 2025

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 562e61d... Auto-update of site package files
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging Documentation/CodeSnippets/my_site_package/Resources/Private/Language/locallang.xlf
CONFLICT (content): Merge conflict in Documentation/CodeSnippets/my_site_package/Resources/Private/Language/locallang.xlf
Auto-merging Documentation/CodeSnippets/my_site_package/Resources/Private/Language/locallang_be.xlf
CONFLICT (content): Merge conflict in Documentation/CodeSnippets/my_site_package/Resources/Private/Language/locallang_be.xlf
Auto-merging Documentation/CodeSnippets/my_site_package/Resources/Private/Language/locallang_db.xlf
CONFLICT (content): Merge conflict in Documentation/CodeSnippets/my_site_package/Resources/Private/Language/locallang_db.xlf

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-13.4 13.4
# Navigate to the new working tree
cd .worktrees/backport-13.4
# Create a new branch
git switch --create backport-354-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 562e61d75d2b4121302b86c94ab7e4d3efe6748a
# Push it to GitHub
git push --set-upstream origin backport-354-to-13.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-13.4

Then, create a pull request where the base branch is 13.4 and the compare/head branch is backport-354-to-13.4.

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.

2 participants