Skip to content

Conversation

@mkiebele
Copy link
Contributor

No description provided.

@linawolf
Copy link
Member

We must move the content somewhere before we remove it from here. And redirects are needed

@linawolf linawolf merged commit 784e2c8 into main Nov 6, 2024
@linawolf linawolf deleted the feature/remove-legacy-installation-extension branch November 6, 2024 13:05
@linawolf linawolf self-assigned this Nov 6, 2024
@github-actions
Copy link
Contributor

github-actions bot commented Nov 6, 2024

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c9d044e... [TASK] Remove chapter legacy installation from working with extensions
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
Auto-merging Documentation/Extensions/Index.rst
CONFLICT (content): Merge conflict in Documentation/Extensions/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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-525-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c9d044e7e5c45b3af09b228536a8d3b518917bdd,ef5054cd9b8bc1cf2fbc640f98951fe81dcbefdc,a85b2d5626c2d060e80459b0809923befdb6c3c1
# Push it to GitHub
git push --set-upstream origin backport-525-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-525-to-12.4.

@github-actions
Copy link
Contributor

github-actions bot commented Nov 6, 2024

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c9d044e... [TASK] Remove chapter legacy installation from working with extensions
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
Auto-merging Documentation/Extensions/Index.rst
CONFLICT (content): Merge conflict in Documentation/Extensions/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-13.4 13.4
# Navigate to the new working tree
cd .worktrees/backport-13.4
# Create a new branch
git switch --create backport-525-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c9d044e7e5c45b3af09b228536a8d3b518917bdd,ef5054cd9b8bc1cf2fbc640f98951fe81dcbefdc,a85b2d5626c2d060e80459b0809923befdb6c3c1
# Push it to GitHub
git push --set-upstream origin backport-525-to-13.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-13.4

Then, create a pull request where the base branch is 13.4 and the compare/head branch is backport-525-to-13.4.

linawolf added a commit that referenced this pull request Nov 6, 2024
* [TASK] Remove chapter legacy installation from working with extensions

* Update Index.rst

---------

Co-authored-by: Kiebele <[email protected]>
Co-authored-by: Lina Wolf <[email protected]>
(cherry picked from commit 784e2c8)
linawolf added a commit that referenced this pull request Nov 6, 2024
* [TASK] Remove chapter legacy installation from working with extensions

* Update Index.rst

---------

Co-authored-by: Kiebele <[email protected]>
Co-authored-by: Lina Wolf <[email protected]>
(cherry picked from commit 784e2c8)
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