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] Update link to blog article "Migration to typo3/composer-cms-installers version 4+" #4787

Merged
merged 1 commit into from
Sep 25, 2024

Conversation

brotkrueml
Copy link
Contributor

Releases: main, 12.4, 11.5

…nstallers version 4+"

Releases: main, 12.4, 11.5
@brotkrueml brotkrueml added backport 11.5 Backport to TYPO3v11 backport 12.4 Backport to TYPO3v12 labels Sep 25, 2024
@brotkrueml brotkrueml self-assigned this Sep 25, 2024
@garvinhicking garvinhicking merged commit e8d9b90 into TYPO3-Documentation:main Sep 25, 2024
8 checks passed
Copy link
Contributor

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 9fb60f9a2... [TASK] Update link to blog article "Migration to typo3/composer-cms-installers version 4+"
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 advice.mergeConflict false"

stdout
Auto-merging Documentation/ApiOverview/DirectoryStructure/Index.rst
CONFLICT (content): Merge conflict in Documentation/ApiOverview/DirectoryStructure/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-4787-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 9fb60f9a20ad46890e95a2dbf1d856101781ddf4
# Push it to GitHub
git push --set-upstream origin backport-4787-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-4787-to-11.5.

@garvinhicking
Copy link
Contributor

Thanks, manually backported to 11.5

@brotkrueml
Copy link
Contributor Author

@garvinhicking Thanks 🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 11.5 Backport to TYPO3v11 backport 12.4 Backport to TYPO3v12 backport-done
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants