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

[BUGFIX] Add missing reference for concepts #154

Merged
merged 2 commits into from
Apr 2, 2024
Merged

Conversation

brotkrueml
Copy link
Contributor

Releases: main, 12.4, 11.5

@brotkrueml brotkrueml merged commit 514989d into main Apr 2, 2024
@brotkrueml brotkrueml deleted the add-ref-for-concepts branch April 2, 2024 13:01
Copy link

github-actions bot commented Apr 2, 2024

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 1d78fc9... Consider Russian translation
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/Index.rst
[backport-154-to-11.5 a082c0d] [BUGFIX] Add missing reference for concepts
 Author: Chris Müller <[email protected]>
 Date: Mon Apr 1 19:15:36 2024 +0200
 1 file changed, 1 insertion(+), 1 deletion(-)
CONFLICT (modify/delete): Documentation/Localization.ru_RU/Index.rst deleted in HEAD and modified in 1d78fc9 (Consider Russian translation).  Version 1d78fc9 (Consider Russian translation) of Documentation/Localization.ru_RU/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-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-154-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 7bb074a2ee51d19516a29fe0be65cee1a7d7c055,1d78fc9846a3e55a8fc611b6177612ea0f95751d
# Push it to GitHub
git push --set-upstream origin backport-154-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-154-to-11.5.

Copy link

github-actions bot commented Apr 2, 2024

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 1d78fc9... Consider Russian translation
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
[backport-154-to-12.4 5733408] [BUGFIX] Add missing reference for concepts
 Author: Chris Müller <[email protected]>
 Date: Mon Apr 1 19:15:36 2024 +0200
 1 file changed, 1 insertion(+), 1 deletion(-)
CONFLICT (modify/delete): Documentation/Localization.ru_RU/Index.rst deleted in HEAD and modified in 1d78fc9 (Consider Russian translation).  Version 1d78fc9 (Consider Russian translation) of Documentation/Localization.ru_RU/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-154-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 7bb074a2ee51d19516a29fe0be65cee1a7d7c055,1d78fc9846a3e55a8fc611b6177612ea0f95751d
# Push it to GitHub
git push --set-upstream origin backport-154-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-154-to-12.4.

brotkrueml added a commit that referenced this pull request Apr 2, 2024
brotkrueml added a commit that referenced this pull request Apr 2, 2024
brotkrueml added a commit that referenced this pull request Apr 2, 2024
brotkrueml added a commit that referenced this pull request Apr 2, 2024
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.

3 participants