Skip to content

Conversation

linawolf
Copy link
Member

To reflect the changes in the naming in the backend module and the changes in usage of TypoScript.

Depends on #1319

Related: TYPO3-Documentation/Changelog-To-Doc#136
Releases: main, 12.4

@linawolf linawolf marked this pull request as draft August 26, 2024 03:37
@linawolf linawolf self-assigned this Aug 26, 2024
To reflect the changes in the naming in the backend module and the changes in usage of TypoScript.

Depends on #1319

Related: TYPO3-Documentation/Changelog-To-Doc#136
Releases: main, 12.4
@linawolf linawolf force-pushed the task/rename-templates branch from b114f2f to bae0602 Compare September 8, 2024 14:50
@linawolf linawolf marked this pull request as ready for review September 9, 2024 10:02
@linawolf linawolf merged commit 542dcc2 into main Sep 9, 2024
8 checks passed
@linawolf linawolf deleted the task/rename-templates branch September 9, 2024 10:21
Copy link
Contributor

github-actions bot commented Sep 9, 2024

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply db7b04bb... [FEATURE] TypoScript module renamed: Document for TypoScript debugging
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
CONFLICT (rename/delete): Documentation/Images/AutomaticScreenshots/TemplatesModul/TemplatesConstants.rst.txt renamed to Documentation/Images/AutomaticScreenshots/TemplatesModul/TemplatesConstantEditor.rst.txt in HEAD, but deleted in db7b04bb ([FEATURE] TypoScript module renamed: Document for TypoScript debugging).
CONFLICT (modify/delete): Documentation/Images/AutomaticScreenshots/TemplatesModul/TemplatesConstantEditor.rst.txt deleted in db7b04bb ([FEATURE] TypoScript module renamed: Document for TypoScript debugging) and modified in HEAD.  Version HEAD of Documentation/Images/AutomaticScreenshots/TemplatesModul/TemplatesConstantEditor.rst.txt 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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-1324-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick db7b04bb762cc57606adae6d0082df8ac83d9240,0f8386fde8b35accfb89d5540a9aaa145a9bbb90,bae06020a446af12dff18842df968d9aa9c4fc3f,3600d7fda64fa685aa6725a2ee3cd8ef0303b187
# Push it to GitHub
git push --set-upstream origin backport-1324-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-1324-to-12.4.

linawolf added a commit that referenced this pull request Sep 9, 2024
* [FEATURE] TypoScript module renamed: Document for TypoScript debugging

Depends on #1319 which should be merged first

Related: TYPO3-Documentation/Changelog-To-Doc#136
Releases: main, 12.4

* [FEATURE] TypoScript module renamed: Adjust backend module overview

Depends on #1321

Related: TYPO3-Documentation/Changelog-To-Doc#136
Releases: main, 12.4

* [TASK] Rename TypoScript template - TypoScript configuration

To reflect the changes in the naming in the backend module and the changes in usage of TypoScript.

Depends on #1319

Related: TYPO3-Documentation/Changelog-To-Doc#136
Releases: main, 12.4
(cherry picked from commit 542dcc2)
@linawolf linawolf added backport-done Changes have been backported to other branches already and removed backport failed labels Sep 9, 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.

1 participant