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] Add inline syntax to Fluid syntax #1948

Merged

Conversation

sypets
Copy link
Contributor

@sypets sypets commented Jul 12, 2022

Some content was migrated from the Extbase book but has been
considerably shortened.

Related: TYPO3-Documentation/TYPO3CMS-Book-ExtbaseFluid#536

Some content was migrated from the Extbase book but has been
considerably shortened.

Related: TYPO3-Documentation/TYPO3CMS-Book-ExtbaseFluid#536
@linawolf linawolf enabled auto-merge (squash) July 12, 2022 16:02
@linawolf linawolf merged commit e0ed6e7 into TYPO3-Documentation:main Jul 12, 2022
@github-actions
Copy link
Contributor

The backport to 10.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply cd9f5f23... [TASK] Add inline syntax to Fluid syntax
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".

stdout
CONFLICT (modify/delete): Documentation/ApiOverview/Fluid/Syntax.rst deleted in HEAD and modified in cd9f5f23 ([TASK] Add inline syntax to Fluid syntax).  Version cd9f5f23 ([TASK] Add inline syntax to Fluid syntax) of Documentation/ApiOverview/Fluid/Syntax.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-10.4 10.4
# Navigate to the new working tree
cd .worktrees/backport-10.4
# Create a new branch
git switch --create backport-1948-to-10.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick cd9f5f232c04e898a185033f001faf1d748c0038
# Push it to GitHub
git push --set-upstream origin backport-1948-to-10.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-10.4

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

@linawolf
Copy link
Member

Page didn't exist in 10.4 yet

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants