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] Clean up and order stdwrap #1492

Merged
merged 1 commit into from
Dec 27, 2024
Merged

[TASK] Clean up and order stdwrap #1492

merged 1 commit into from
Dec 27, 2024

Conversation

linawolf
Copy link
Member

Releases: main, 13.4, 12.4

Releases: main, 13.4, 12.4
@linawolf linawolf self-assigned this Dec 27, 2024
@linawolf linawolf merged commit 3875794 into main Dec 27, 2024
10 checks passed
@linawolf linawolf deleted the task/stdwrap branch December 27, 2024 04:31
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 572a79f8... [TASK] Clean up and order stdwrap
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/Functions/Stdwrap.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Stdwrap.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-1492-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 572a79f8bef41e80fb55d9749394170b80d58678
# Push it to GitHub
git push --set-upstream origin backport-1492-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-1492-to-12.4.

@linawolf linawolf added backport-done Changes have been backported to other branches already and removed backport failed backport 12.4 labels Dec 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 13.4 backport-done Changes have been backported to other branches already
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant