Skip to content

Conversation

franzholz
Copy link
Contributor

No description provided.

@franzholz franzholz marked this pull request as draft September 5, 2025 14:26
@franzholz franzholz marked this pull request as ready for review September 5, 2025 14:38
@garvinhicking garvinhicking added backport 12.4 Backport to TYPO3v12 backport 13.4 Backport to TYPO3v13 labels Sep 5, 2025
@garvinhicking garvinhicking merged commit d409121 into TYPO3-Documentation:main Sep 5, 2025
7 checks passed
Copy link
Contributor

github-actions bot commented Sep 5, 2025

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 5b5a0c7da... Update Index.rst
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/ExtensionArchitecture/Extbase/Reference/Domain/Repository/Index.rst
CONFLICT (content): Merge conflict in Documentation/ExtensionArchitecture/Extbase/Reference/Domain/Repository/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-5997-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 5b5a0c7daf259b7ee15242dc87a22cfe16ac27a4,8f481b91fd60773c3dbb94982b34d92d7dc1a713,5d1fd5cfc7dfe467ff574ba3eb26d9c1d45d9c6c,25b44dd6b70e9482a9bf2d9ce852a6c390cf6968
# Push it to GitHub
git push --set-upstream origin backport-5997-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-5997-to-12.4.

Copy link
Contributor

github-actions bot commented Sep 5, 2025

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 8f481b91f... small changes
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/ExtensionArchitecture/Extbase/Reference/Domain/Repository/Index.rst
[backport-5997-to-13.4 db2caa712] Update Index.rst
 Author: Franz Holzinger <[email protected]>
 Date: Fri Sep 5 16:21:19 2025 +0200
 1 file changed, 4 insertions(+), 4 deletions(-)
Auto-merging Documentation/ExtensionArchitecture/Extbase/Reference/Domain/Repository/Index.rst
CONFLICT (content): Merge conflict in Documentation/ExtensionArchitecture/Extbase/Reference/Domain/Repository/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-5997-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 5b5a0c7daf259b7ee15242dc87a22cfe16ac27a4,8f481b91fd60773c3dbb94982b34d92d7dc1a713,5d1fd5cfc7dfe467ff574ba3eb26d9c1d45d9c6c,25b44dd6b70e9482a9bf2d9ce852a6c390cf6968
# Push it to GitHub
git push --set-upstream origin backport-5997-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-5997-to-13.4.

@franzholz franzholz deleted the patch-61 branch September 6, 2025 18:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport failed backport 12.4 Backport to TYPO3v12 backport 13.4 Backport to TYPO3v13
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants