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 DataHandler introduction #4171

Merged

Conversation

brotkrueml
Copy link
Contributor

Releases: main, 12.4, 11.5

Releases: main, 12.4, 11.5
@brotkrueml brotkrueml added backport 11.5 backport 12.4 Backport to TYPO3v12 labels Mar 11, 2024
@brotkrueml brotkrueml self-assigned this Mar 11, 2024
garvinhicking
garvinhicking previously approved these changes Mar 12, 2024
Copy link
Contributor

@garvinhicking garvinhicking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two minor code language hints, nothing blocking. Thanks! :)

Co-authored-by: Garvin Hicking <blog@garv.in>
Co-authored-by: Garvin Hicking <blog@garv.in>
@brotkrueml brotkrueml merged commit ff6f0c8 into TYPO3-Documentation:main Mar 14, 2024
4 checks passed
@brotkrueml brotkrueml deleted the revise-datahandler-introduction branch March 14, 2024 06:58
Copy link
Contributor

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 16e41e7a... [TASK] Revise DataHandler introduction
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/ApiOverview/DataHandler/Introduction/Index.rst
CONFLICT (content): Merge conflict in Documentation/ApiOverview/DataHandler/Introduction/Index.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-4171-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 16e41e7a5c0aac35eb22048181508c3d858e8e3b,72ceec452cc612054f57a34b3332017a121de7cd,d2b100982bf93fa5ee7bc1f8182c3ca04c69d9d4
# Push it to GitHub
git push --set-upstream origin backport-4171-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-4171-to-11.5.

brotkrueml added a commit that referenced this pull request Mar 14, 2024
Backport #4171
 **Authored by:** @brotkrueml

---------

Co-authored-by: Chris Müller <2566282+brotkrueml@users.noreply.github.com>
Co-authored-by: Lina Wolf <48202465+linawolf@users.noreply.github.com>
Co-authored-by: Garvin Hicking <blog@garv.in>
brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-CoreApi that referenced this pull request Mar 14, 2024
…tation#4171)

Releases: main, 12.4, 11.5

---------

Co-authored-by: Lina Wolf <48202465+linawolf@users.noreply.github.com>
Co-authored-by: Garvin Hicking <blog@garv.in>
brotkrueml added a commit that referenced this pull request Mar 14, 2024
Releases: main, 12.4, 11.5

Co-authored-by: Lina Wolf <48202465+linawolf@users.noreply.github.com>
Co-authored-by: Garvin Hicking <blog@garv.in>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 12.4 Backport to TYPO3v12 backport-done
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants