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] Update login page screenshot #142

Merged
merged 1 commit into from
Oct 29, 2023
Merged

Conversation

brotkrueml
Copy link
Contributor

Previously, this screenshot has been generated automatically. But as the
Screenshot Tool is not working anymore in newer TYPO3 versions, the image
has been moved to the "ManualScreenshots" folder.

Releases: main, 12.4

@brotkrueml brotkrueml requested a review from linawolf October 29, 2023 08:58
@brotkrueml brotkrueml self-assigned this Oct 29, 2023
@brotkrueml brotkrueml merged commit b2dd99a into main Oct 29, 2023
1 check passed
@brotkrueml brotkrueml deleted the update-login-screenshot branch October 29, 2023 12:24
@github-actions
Copy link

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply d422a8a... [TASK] Update login page screenshot
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
CONFLICT (modify/delete): Documentation/Localization.ru_RU/Login/Index.rst deleted in HEAD and modified in d422a8a ([TASK] Update login page screenshot).  Version d422a8a ([TASK] Update login page screenshot) of Documentation/Localization.ru_RU/Login/Index.rst left in tree.
CONFLICT (modify/delete): Documentation/Localization.ru_RU/screenshots.json deleted in HEAD and modified in d422a8a ([TASK] Update login page screenshot).  Version d422a8a ([TASK] Update login page screenshot) of Documentation/Localization.ru_RU/screenshots.json 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-142-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick d422a8a7aa367aa24b7a5e8aab74b9d829fbc45f
# Push it to GitHub
git push --set-upstream origin backport-142-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-142-to-12.4.

brotkrueml added a commit that referenced this pull request Oct 30, 2023
brotkrueml added a commit that referenced this pull request Oct 30, 2023
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