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] Unify spelling of "Ajax" #2391

Merged
merged 1 commit into from
Nov 3, 2022
Merged

[TASK] Unify spelling of "Ajax" #2391

merged 1 commit into from
Nov 3, 2022

Conversation

linawolf
Copy link
Member

@linawolf linawolf commented Nov 3, 2022

references: #2331
releases: main, 11.5

references: #2331
releases: main, 11.5
@linawolf linawolf merged commit 5acb80d into main Nov 3, 2022
@linawolf linawolf deleted the lwolf-fix-ajax-wording branch November 3, 2022 11:04
@github-actions
Copy link
Contributor

github-actions bot commented Nov 3, 2022

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 692d08ad... [TASK] Unify spelling of "Ajax"
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/ApiOverview/Backend/Ajax.rst
Auto-merging Documentation/ApiOverview/Backend/BackendRouting.rst
CONFLICT (modify/delete): Documentation/ApiOverview/FlashMessages/_ES6/_flash-message-deferred-action-demo.js deleted in HEAD and modified in 692d08ad ([TASK] Unify spelling of "Ajax").  Version 692d08ad ([TASK] Unify spelling of "Ajax") of Documentation/ApiOverview/FlashMessages/_ES6/_flash-message-deferred-action-demo.js left in tree.
Auto-merging Documentation/ApiOverview/FormEngine/Rendering/Index.rst
CONFLICT (content): Merge conflict in Documentation/ApiOverview/FormEngine/Rendering/Index.rst
Auto-merging Documentation/ApiOverview/Icon/Index.rst
CONFLICT (content): Merge conflict in Documentation/ApiOverview/Icon/Index.rst
Auto-merging Documentation/ApiOverview/RequestLifeCycle/Bootstrapping.rst
Auto-merging Documentation/CodeSnippets/Events/Backend/AfterPageColumnsSelectedForLocalizationEvent.rst.txt
CONFLICT (content): Merge conflict in Documentation/CodeSnippets/Events/Backend/AfterPageColumnsSelectedForLocalizationEvent.rst.txt
Auto-merging Documentation/Configuration/Typo3ConfVars/FE.rst
Auto-merging Documentation/ExtensionArchitecture/FileStructure/Configuration/Backend/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-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-2391-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 692d08ad16773b8f120f23496f9f85b6e10a4872
# Push it to GitHub
git push --set-upstream origin backport-2391-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-2391-to-11.5.

linawolf added a commit that referenced this pull request Nov 3, 2022
references: #2331
releases: main, 11.5

Co-authored-by: lina.wolf <[email protected]>

(cherry picked from commit 5acb80d)
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