Skip to content

Conversation

@prathers
Copy link
Contributor

WIP: A summarized list of BP

@linawolf linawolf added the backport 13.4 Backport to TYPO3v13 label Nov 27, 2025
@linawolf linawolf merged commit 45112a7 into TYPO3-Documentation:main Nov 27, 2025
6 checks passed
@github-actions
Copy link
Contributor

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply e9e348c00... Add Bestpractice.rst
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/ApiOverview/Localization/TranslationServer/Crowdin.rst
Auto-merging Documentation/ApiOverview/Localization/TranslationServer/Crowdin/Bestpractice.rst
CONFLICT (add/add): Merge conflict in Documentation/ApiOverview/Localization/TranslationServer/Crowdin/Bestpractice.rst

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-6211-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick e9e348c0036d036a50699e92f807b73252eb9829,427fb94ad69e77023113e86d62631858ce19d972,39fd26f1f717c657ff55c96b1a282330c926e374,dea586206ae250c8f28a8a9a4d38059c274a8576,ab3b72c558ba45253e4ae2fcfd6220cca1f294cd,02d1b610d1bb587e875891631c4b0d041a225496,752a081278bcce04a381a0f54088472286c169f5,bd36d2f809e2c114cee4ee80c062034b3d01c365,cf144652385f4ac30e8604e95fe1afb5d3a7792a,4d08d9dc0cb56e8acbb49bcb77d70e945c127aaa
# Push it to GitHub
git push --set-upstream origin backport-6211-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-6211-to-13.4.

linawolf pushed a commit that referenced this pull request Nov 27, 2025
* Add Bestpractice.rst

* Improvements after QA

* New render of links

* add section for proofreaders

* WIP: added a short lidt of best practices

* Update Documentation/ApiOverview/Localization/TranslationServer/Crowdin/Bestpractice.rst

Co-authored-by: Peter Kraume <[email protected]>

* Update Documentation/ApiOverview/Localization/TranslationServer/Crowdin/Bestpractice.rst

Co-authored-by: Peter Kraume <[email protected]>

* Update Documentation/ApiOverview/Localization/TranslationServer/Crowdin/Bestpractice.rst

Co-authored-by: Peter Kraume <[email protected]>

---------

Co-authored-by: Peter Kraume <[email protected]>

(cherry picked from commit 45112a7)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 13.4 Backport to TYPO3v13 backport-done

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants