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] Revise GIFBUILDER properties #888

Merged

Conversation

brotkrueml
Copy link
Contributor

  • Replace container table-row with a sphinx object type
  • Add a TOC for the properties
  • Sort properties alphabetically
  • Add references where appropriate

Releases: main, 12.4, 11.5

- Replace container table-row with a sphinx object type
- Add a TOC for the properties
- Sort properties alphabetically
- Add references where appropriate

Releases: main, 12.4, 11.5
@brotkrueml brotkrueml merged commit 9fb6e2c into TYPO3-Documentation:main Nov 7, 2023
2 checks passed
@brotkrueml brotkrueml deleted the revise-gifbuilder-properties branch November 7, 2023 14:46
Copy link

github-actions bot commented Nov 7, 2023

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0061e15... [TASK] Revise 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

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

Copy link

github-actions bot commented Nov 7, 2023

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0061e15... [TASK] Revise 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

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

brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-Typoscript that referenced this pull request Nov 7, 2023
- Replace container table-row with a sphinx object type
- Add a TOC for the properties
- Sort properties alphabetically
- Add references where appropriate

Releases: main, 12.4, 11.5
brotkrueml added a commit that referenced this pull request Nov 7, 2023
- Replace container table-row with a sphinx object type
- Add a TOC for the properties
- Sort properties alphabetically
- Add references where appropriate

Releases: main, 12.4, 11.5
brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-Typoscript that referenced this pull request Nov 7, 2023
…ion#888) (TYPO3-Documentation#892)

- Replace container table-row with a sphinx object type
- Add a TOC for the properties
- Sort properties alphabetically
- Add references where appropriate

Releases: main, 12.4, 11.5
brotkrueml added a commit that referenced this pull request Nov 7, 2023
- Replace container table-row with a sphinx object type
- Add a TOC for the properties
- Sort properties alphabetically
- Add references where appropriate

Releases: main, 12.4, 11.5
@brotkrueml brotkrueml added backport-done Changes have been backported to other branches already and removed backport failed labels Nov 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 11.5 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.

None yet

2 participants