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 "Working with pages" screenshots #144

Merged
merged 1 commit into from
Oct 29, 2023

Conversation

brotkrueml
Copy link
Contributor

Releases: main, 12.4

@brotkrueml brotkrueml requested a review from linawolf October 29, 2023 10:42
@brotkrueml brotkrueml self-assigned this Oct 29, 2023
@brotkrueml
Copy link
Contributor Author

@aksenovaa Please have a look, some minor changes happened on the English page. The text on the Russian page should also be adjusted.

@brotkrueml brotkrueml merged commit a20b96e into main Oct 29, 2023
1 check passed
@brotkrueml brotkrueml deleted the update-screenshot-working-with-pages branch October 29, 2023 12:26
@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 df3d542... [TASK] Update "Working with pages" screenshots
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/Images/ManualScreenshots/PageTree/CopyMoveChildPage.png deleted in HEAD and modified in df3d542 ([TASK] Update "Working with pages" screenshots).  Version df3d542 ([TASK] Update "Working with pages" screenshots) of Documentation/Localization.ru_RU/Images/ManualScreenshots/PageTree/CopyMoveChildPage.png left in tree.
CONFLICT (modify/delete): Documentation/Localization.ru_RU/Images/ManualScreenshots/PageTree/CopyMovePage.png deleted in HEAD and modified in df3d542 ([TASK] Update "Working with pages" screenshots).  Version df3d542 ([TASK] Update "Working with pages" screenshots) of Documentation/Localization.ru_RU/Images/ManualScreenshots/PageTree/CopyMovePage.png left in tree.
CONFLICT (modify/delete): Documentation/Localization.ru_RU/Images/ManualScreenshots/PageTree/DeletePage.png deleted in HEAD and modified in df3d542 ([TASK] Update "Working with pages" screenshots).  Version df3d542 ([TASK] Update "Working with pages" screenshots) of Documentation/Localization.ru_RU/Images/ManualScreenshots/PageTree/DeletePage.png left in tree.
CONFLICT (modify/delete): Documentation/Localization.ru_RU/Images/ManualScreenshots/PageTree/PageTreeFilter.png deleted in HEAD and modified in df3d542 ([TASK] Update "Working with pages" screenshots).  Version df3d542 ([TASK] Update "Working with pages" screenshots) of Documentation/Localization.ru_RU/Images/ManualScreenshots/PageTree/PageTreeFilter.png left in tree.
CONFLICT (modify/delete): Documentation/Localization.ru_RU/Pages/WorkingWithPages/Index.rst deleted in HEAD and modified in df3d542 ([TASK] Update "Working with pages" screenshots).  Version df3d542 ([TASK] Update "Working with pages" screenshots) of Documentation/Localization.ru_RU/Pages/WorkingWithPages/Index.rst 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-144-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick df3d542b22a9ec42528200500f76e849c162ce0c
# Push it to GitHub
git push --set-upstream origin backport-144-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-144-to-12.4.

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