Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update apply-precommit.yml #662

Merged
merged 1 commit into from
Feb 5, 2025
Merged

Update apply-precommit.yml #662

merged 1 commit into from
Feb 5, 2025

Conversation

garvinhicking
Copy link
Contributor

This should (hopefully) only trigger automatted commits for our own repository scope.

Please only merge after TYPO3-Documentation/TYPO3CMS-Reference-CoreApi#5271 has proven to work properly.

This should (hopefully) only trigger automatted commits for our own repository scope.

Please only merge after TYPO3-Documentation/TYPO3CMS-Reference-CoreApi#5271 has proven to work properly.
@linawolf linawolf merged commit 2e6bd49 into main Feb 5, 2025
12 checks passed
@linawolf linawolf deleted the garvinhicking-patch-1 branch February 5, 2025 15:05
Copy link
Contributor

github-actions bot commented Feb 5, 2025

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
To https://github.com/TYPO3-Documentation/TYPO3CMS-Tutorial-GettingStarted.git
 ! [remote rejected] backport-662-to-12.4 -> backport-662-to-12.4 (refusing to allow a GitHub App to create or update workflow `.github/workflows/apply-precommit.yml` without `workflows` permission)
error: failed to push some refs to 'https://github.com/TYPO3-Documentation/TYPO3CMS-Tutorial-GettingStarted.git'

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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-662-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0e06252b4195d40a7107103eb860036b3dbbc044
# Push it to GitHub
git push --set-upstream origin backport-662-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

Then, create a pull request where the base branch is 12.4 and the compare/head branch is backport-662-to-12.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