Skip to content

Conversation

@mkiebele
Copy link
Contributor

@mkiebele mkiebele commented Nov 5, 2024

No description provided.

@linawolf linawolf dismissed garvinhicking’s stale review November 6, 2024 13:19

All changes have been applied

Copy link
Contributor

@sarahmccarthy123 sarahmccarthy123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a few minor language corrections :-)

@linawolf linawolf merged commit c4aa371 into main Nov 6, 2024
@linawolf linawolf deleted the feature/recommended-extensions branch November 6, 2024 15:28
@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 b475ea4... [Task] List of recommended 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-536-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b475ea466feed301cc8b4d5bc64120aa6efcd2b9,2b23c90c921c7e77a8a8b3c20816bd5566023531,6532f25caf2698ff53f475644c5eda25b2b478cc,5396fd303450a196727e8ace49d97ec660eeb405,00ac992516eed01eb7b733056c3f4c97e97c0731,5e9720dfb37a0a9bcd8447ff693dbd5182d19f23,f95a774c1693839b7361a9f38574fcab3490f60e,42a43c350727dd2b400033060de488b03166c662
# Push it to GitHub
git push --set-upstream origin backport-536-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-536-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 b475ea4... [Task] List of recommended 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-536-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b475ea466feed301cc8b4d5bc64120aa6efcd2b9,2b23c90c921c7e77a8a8b3c20816bd5566023531,6532f25caf2698ff53f475644c5eda25b2b478cc,5396fd303450a196727e8ace49d97ec660eeb405,00ac992516eed01eb7b733056c3f4c97e97c0731,5e9720dfb37a0a9bcd8447ff693dbd5182d19f23,f95a774c1693839b7361a9f38574fcab3490f60e,42a43c350727dd2b400033060de488b03166c662
# Push it to GitHub
git push --set-upstream origin backport-536-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-536-to-13.4.

linawolf pushed a commit that referenced this pull request Nov 6, 2024
* [Task] List of recommended extensions

---------

Co-authored-by: Kiebele <[email protected]>
Co-authored-by: Lina Wolf <[email protected]>
Co-authored-by: Sarah McCarthy <[email protected]>

(cherry picked from commit c4aa371)
linawolf added a commit that referenced this pull request Nov 6, 2024
* [Task] List of recommended extensions

---------

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

6 participants