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

[BUGFIX] update locallang_db.xlf - missing field names added #76

Merged
merged 2 commits into from
Mar 29, 2024
Merged

Conversation

format-gmbh
Copy link
Contributor

No description provided.

@format-gmbh
Copy link
Contributor Author

This is my first attempt to see if I can create a PR.

@brotkrueml
Copy link
Contributor

@format-gmbh Good catch and well done. Thanks for the fix 👍

@brotkrueml brotkrueml merged commit 2ce40a2 into TYPO3-Documentation:main Mar 29, 2024
4 checks passed
Copy link

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 128
stderr
error: commit 5509412b73c93b4980931eb22922f5cbbdb79a17 is a merge but no -m option was given.
fatal: cherry-pick failed

stdout
[backport-76-to-12.4 410b12f] [BUGFIX] update locallang_db.xlf - missing field names added
 Author: Andreas Kessel <[email protected]>
 Date: Fri Mar 29 12:43:47 2024 +0100
 1 file changed, 12 insertions(+)

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-76-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ea2db99393de505edccd5e6034c9e341d5f6927d,5509412b73c93b4980931eb22922f5cbbdb79a17
# Push it to GitHub
git push --set-upstream origin backport-76-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-76-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