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

[TASK] Introduce custom types for GIFBUILDER properties #903

Conversation

brotkrueml
Copy link
Contributor

Releases: main, 12.4, 11.5

@brotkrueml brotkrueml merged commit 31f786e into TYPO3-Documentation:main Nov 15, 2023
2 checks passed
@brotkrueml brotkrueml deleted the gifbuilder-properties-custom-types branch November 15, 2023 17:55
Copy link

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0f811db... [TASK] Introduce custom types for GIFBUILDER properties
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".

stdout
Auto-merging Documentation/Gifbuilder/Properties.rst
CONFLICT (content): Merge conflict in Documentation/Gifbuilder/Properties.rst
Auto-merging Documentation/Settings.cfg

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

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

Copy link

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0f811db... [TASK] Introduce custom types for GIFBUILDER properties
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".

stdout
Auto-merging Documentation/Gifbuilder/Properties.rst
CONFLICT (content): Merge conflict in Documentation/Gifbuilder/Properties.rst
Auto-merging Documentation/Settings.cfg

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-903-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0f811db7407768234a9cb291c69c11c5b8fa5807
# Push it to GitHub
git push --set-upstream origin backport-903-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-903-to-12.4.

brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-Typoscript that referenced this pull request Nov 15, 2023
brotkrueml added a commit that referenced this pull request Nov 15, 2023
brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-Typoscript that referenced this pull request Nov 15, 2023
brotkrueml added a commit that referenced this pull request Nov 15, 2023
@brotkrueml brotkrueml added backport-done Changes have been backported to other branches already and removed backport failed labels Nov 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 12.4 backport-done Changes have been backported to other branches already
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants