Skip to content

Update Setup.rst #730

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

Merged
merged 1 commit into from
May 18, 2025
Merged

Update Setup.rst #730

merged 1 commit into from
May 18, 2025

Conversation

tmmschmit
Copy link
Contributor

There is a small typo ; in the ddev yaml config the environment property should be named web_environment (cf: https://raw.githubusercontent.com/ddev/ddev/master/pkg/ddevapp/schema.json).

There is a small typo ; in the ddev yaml config the `environment` property should be named `web_environment` (cf: https://raw.githubusercontent.com/ddev/ddev/master/pkg/ddevapp/schema.json).
Copy link
Contributor

@sarahmccarthy123 sarahmccarthy123 left a comment

Choose a reason for hiding this comment

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

Yes this looks correct

@linawolf linawolf merged commit 357170b into TYPO3-Documentation:main May 18, 2025
5 of 6 checks passed
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0b68d97... Update Setup.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
CONFLICT (modify/delete): Documentation/Installation/Setup.rst deleted in HEAD and modified in 0b68d97 (Update Setup.rst).  Version 0b68d97 (Update Setup.rst) of Documentation/Installation/Setup.rst left in tree.

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-730-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0b68d97d0ba9eb420141182e19562136f693bb6e
# Push it to GitHub
git push --set-upstream origin backport-730-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-730-to-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