Skip to content

Conversation

@linawolf
Copy link
Member

The summary is not very useful and quickly out of date

Update next steps, remove outdated videos, update how to contact the community and ask questions.

Releases: main, 13.4

The summary is not very useful and quickly out of date

Update next steps, remove outdated videos, update how to contact the community and ask questions.

Releases: main, 13.4
@linawolf linawolf self-assigned this Nov 10, 2024
@linawolf linawolf merged commit 4b5b6de into main Nov 10, 2024
@linawolf linawolf deleted the task/summary branch November 10, 2024 09:07
@github-actions
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply acd9b55... [TASK] Remove the summary, keep and update next steps
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/Index.rst
CONFLICT (content): Merge conflict in Documentation/Index.rst
Auto-merging Documentation/Introduction/Index.rst
CONFLICT (content): Merge conflict in Documentation/Introduction/Index.rst
CONFLICT (modify/delete): Documentation/Summary/Index.rst deleted in acd9b55 ([TASK] Remove the summary, keep and update next steps) and modified in HEAD.  Version HEAD of Documentation/Summary/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-231-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick acd9b557f369ec1f3a97707a91423ab3aa376b90
# Push it to GitHub
git push --set-upstream origin backport-231-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-231-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