Skip to content

Conversation

@linawolf
Copy link
Member

Resolves: TYPO3-Documentation/Changelog-To-Doc#1050
Releases: main, 13.4

@linawolf linawolf self-assigned this Nov 20, 2024
@linawolf linawolf merged commit 8be1e20 into main Nov 20, 2024
9 checks passed
@linawolf linawolf deleted the task/colorScheme branch November 20, 2024 08:58
@github-actions
Copy link
Contributor

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

stdout
[backport-1434-to-13.4 5027c032] [FEATURE] Add support for AVIF files in GIFBuilder
 Author: lina.wolf <[email protected]>
 Date: Wed Nov 20 09:00:25 2024 +0100
 3 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100644 Documentation/Gifbuilder/_snippets/_avif.typoscript
On branch backport-1434-to-13.4
You are currently cherry-picking commit 5259f30d.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

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-1434-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 1b990e63dfab5400d902c0eba8b2255b37e34568,5259f30dc83cce4c38396e1eb556e6b388390910
# Push it to GitHub
git push --set-upstream origin backport-1434-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-1434-to-13.4.

@linawolf linawolf added backport-done Changes have been backported to other branches already and removed backport failed labels Nov 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 13.4 backport-done Changes have been backported to other branches already

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[FEATURE] Add support for AVIF files in GIFBuilder

2 participants