Skip to content
This repository has been archived by the owner on Nov 19, 2024. It is now read-only.

Update PageTSconfig.rst #515

Merged
merged 1 commit into from
May 10, 2024
Merged

Conversation

froemken
Copy link
Contributor

Remove duplicate a from Page TSconfig docu

Remove duplicate `a` from Page TSconfig docu
Copy link
Member

@linawolf linawolf left a comment

Choose a reason for hiding this comment

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

Thanks for catching this.

@linawolf linawolf merged commit 99d15c9 into TYPO3-Documentation:main May 10, 2024
4 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 e62ab95... Update PageTSconfig.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".

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

Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply e62ab95... Update PageTSconfig.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".

stdout
Auto-merging Documentation/UsingSetting/PageTSconfig.rst
CONFLICT (content): Merge conflict in Documentation/UsingSetting/PageTSconfig.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-515-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick e62ab95951cf6cefbd45750a003ca9517c7273ac
# Push it to GitHub
git push --set-upstream origin backport-515-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-515-to-12.4.

@linawolf
Copy link
Member

It seems like it was only a problem in main.

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

Successfully merging this pull request may close these issues.

2 participants