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

[BUG] Fixes wrong allocation in transOrigPointerField #111

Merged
merged 1 commit into from
Jun 29, 2024

Conversation

creifenscheid
Copy link

In the extended description of the 'transOrigPointerField' field, it is mentioned that it's the first field, but it is actually the second one.

In the extended description of the 'transOrigPointerField' field, it is mentioned that it's the first field, but it is actually the second one.
Copy link
Contributor

@froemken froemken left a comment

Choose a reason for hiding this comment

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

You're right. The word first is wrong here. It get's my OK to merge, but I have a problem with the first and second in general. The third is just mentioned as there is a further field´ and the forth` just describes the property itself. Dear doc team. What do you think? Is that something for a follow-up?

@linawolf linawolf merged commit f3abb01 into TYPO3-Documentation:12.4 Jun 29, 2024
3 checks passed
Copy link

The backport to 12.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
On branch backport-111-to-12.4
You are currently cherry-picking commit 1f7e076.
  (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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-111-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 1f7e076bcc049e5c49e8b3686ae513253f846c99
# Push it to GitHub
git push --set-upstream origin backport-111-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-111-to-12.4.

@linawolf
Copy link
Member

@froemken, yes please, a follow up would be great!

@linawolf
Copy link
Member

was already fixed in 12.4

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants