Skip to content

Conversation

@linawolf
Copy link
Member

Until now, the form ViewHelper itself was listed at the bottom of the menu, its subviewhelpers on top within a directory. As they are used together I moved them into one location now, hiding the former form viewhelper page as orphan so it does not get regenerated.

Update of Form examples tbd I just moved them for the time beeing

Releases: main, 13.4

Until now, the form ViewHelper itself was listed at the bottom of the menu, its subviewhelpers on top within a directory. As they are used together I moved them into one location now, hiding the former form viewhelper page as orphan so it does not get regenerated.

Update of Form examples tbd I just moved them for the time beeing

Releases: main, 13.4
@linawolf linawolf merged commit 49053c6 into main Mar 16, 2025
2 checks passed
@linawolf linawolf deleted the task/form branch March 16, 2025 16:09
@github-actions
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 2089701... [TASK] List Form ViewHelper and Sub View helpers together
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".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging Documentation/Global/Form.rst
CONFLICT (content): Merge conflict in Documentation/Global/Form.rst
Auto-merging Documentation/Global/Form/Index.rst
CONFLICT (content): Merge conflict in Documentation/Global/Form/Index.rst
Auto-merging Documentation/Global/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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-109-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 20897015583d44a4d7d2e10fc9baf1d86a823053
# Push it to GitHub
git push --set-upstream origin backport-109-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-109-to-12.4.

@github-actions
Copy link
Contributor

The backport to done failed:

The process '/usr/bin/git' failed with exit code 128
stderr
fatal: invalid reference: done

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

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

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.

2 participants