Skip to content

Conversation

@linawolf
Copy link
Member

Releases: main, 13.4

@linawolf linawolf merged commit 27f3c54 into main Mar 25, 2025
10 checks passed
@linawolf linawolf deleted the task/form-submit branch March 25, 2025 07:47
@github-actions
Copy link
Contributor

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 4471bba... [TASK] Update f:form.submit ViewHelper page
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/Index.rst
CONFLICT (content): Merge conflict in Documentation/Global/Form/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-13.4 13.4
# Navigate to the new working tree
cd .worktrees/backport-13.4
# Create a new branch
git switch --create backport-117-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 4471bba7595d52249e380699d3af440ec1ce8e4b,35a52ab3a00066b2c6866639eff873c6184fe081
# Push it to GitHub
git push --set-upstream origin backport-117-to-13.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-13.4

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

linawolf added a commit that referenced this pull request Sep 6, 2025
* [TASK] Update f:form.submit ViewHelper page

Releases: main, 13.4

* Apply suggestions from code review

---------

Co-authored-by: Garvin Hicking <[email protected]>
(cherry picked from commit 27f3c54)
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