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 full stdWrap example for page.meta #1338

Merged

Conversation

brotkrueml
Copy link
Contributor

Releases: main, 12.4

@brotkrueml brotkrueml self-assigned this Sep 21, 2024
@brotkrueml brotkrueml marked this pull request as draft September 21, 2024 18:54
@brotkrueml
Copy link
Contributor Author

This PR will most likely conflict with #1336, so marking as draft until the other PR has been merged.

@brotkrueml brotkrueml marked this pull request as ready for review September 24, 2024 16:44
@froemken
Copy link
Contributor

Tested. Looks good. Thank you

@linawolf linawolf merged commit 4c889da into TYPO3-Documentation:main Sep 27, 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 5b6929f2... [TASK] Add full stdWrap example for page.meta
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/TopLevelObjects/Page/Index.rst
CONFLICT (content): Merge conflict in Documentation/TopLevelObjects/Page/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-1338-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 5b6929f23c667cad255e849d381c8d65ed569cc1,8a54f1329984bbc94143279ba7b0e52d2e38cd6b,e13f6a1cfe939d91f00f629a93eb2178722ab52c
# Push it to GitHub
git push --set-upstream origin backport-1338-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-1338-to-12.4.

linawolf pushed a commit that referenced this pull request Sep 28, 2024
* [TASK] Add full stdWrap example for page.meta

Releases: main, 12.4

* Simplify example

(cherry picked from commit 4c889da)
@linawolf linawolf added backport-done Changes have been backported to other branches already and removed backport failed labels Sep 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 12.4 backport-done Changes have been backported to other branches already
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants