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] Use "confval" instead of "aspect" for user TSconfig -> options #414

Conversation

brotkrueml
Copy link
Contributor

Releases: main, 12.4, 11.5

@brotkrueml brotkrueml merged commit c7f6375 into TYPO3-Documentation:main Dec 19, 2023
3 checks passed
@brotkrueml brotkrueml deleted the userts-options-aspect-to-confval branch December 19, 2023 08:50
Copy link
Contributor

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c54e929... [TASK] Use "confval" instead of "aspect" for user TSconfig -> options
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/UserTsconfig/Options.rst
CONFLICT (content): Merge conflict in Documentation/UserTsconfig/Options.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-414-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c54e9292d752d34ea8a86f358c580e78dcadbd9f
# Push it to GitHub
git push --set-upstream origin backport-414-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-414-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 c54e929... [TASK] Use "confval" instead of "aspect" for user TSconfig -> options
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/UserTsconfig/Options.rst
CONFLICT (content): Merge conflict in Documentation/UserTsconfig/Options.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-414-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c54e9292d752d34ea8a86f358c580e78dcadbd9f
# Push it to GitHub
git push --set-upstream origin backport-414-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-414-to-12.4.

brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-TSconfig that referenced this pull request Dec 19, 2023
brotkrueml added a commit that referenced this pull request Dec 19, 2023
…onfig -> options (#414) (#415)

Releases: main, 12.4, 11.5
brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-TSconfig that referenced this pull request Dec 19, 2023
brotkrueml added a commit that referenced this pull request Dec 19, 2023
…onfig -> options (#414) (#416)

Releases: main, 12.4, 11.5
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.

2 participants