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

Add Bash class to composer command #384

Merged
merged 3 commits into from
May 31, 2024

Conversation

franzholz
Copy link
Contributor

Change the style.

@franzholz
Copy link
Contributor Author

Question:

Shouldn't this be changed into Code-Blocks in order to have a copy button on the right side?

image

@froemken
Copy link
Contributor

Currently, I make review only. The change is OK for me. I'm new to docs team...so I don't know all the tiny differences. That's why I have not merged it.

@garvinhicking
Copy link
Contributor

@franzholz I think this patch needs rebasing, could you check?

I made two changes where I think the reference was meant for the product name, not the command, do you agree?

@franzholz
Copy link
Contributor Author

I have checked the patch.

image

@garvinhicking garvinhicking merged commit af58ae5 into TYPO3-Documentation:main May 31, 2024
4 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 6f3ea17... Add Bash class to composer command
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/Installation/DeployTYPO3.rst
CONFLICT (content): Merge conflict in Documentation/Installation/DeployTYPO3.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-384-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 6f3ea175162d7c2d68db5b3570febc88bdd92748,6d65918d636f2db2d6861234c803eb7f0c39a142,6c9ac767dc50cef6d1c825bc8d1883aa0826de85
# Push it to GitHub
git push --set-upstream origin backport-384-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-384-to-12.4.

@garvinhicking
Copy link
Contributor

I have checked the patch.

Great, thanks a lot!

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