Skip to content

Remove faulty indentation #731

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

Merged
merged 1 commit into from
May 17, 2025
Merged

Remove faulty indentation #731

merged 1 commit into from
May 17, 2025

Conversation

linawolf
Copy link
Member

No description provided.

@linawolf linawolf merged commit a5898e2 into main May 17, 2025
12 checks passed
@linawolf linawolf deleted the linawolf-patch-2 branch May 17, 2025 07:06
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 154d053... Remove faulty indentation
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 set advice.mergeConflict false"

stdout
CONFLICT (modify/delete): Documentation/Installation/Setup.rst deleted in HEAD and modified in 154d053 (Remove faulty indentation).  Version 154d053 (Remove faulty indentation) of Documentation/Installation/Setup.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-731-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 154d053d7884afcd5b73ae92c221ba96ba390906
# Push it to GitHub
git push --set-upstream origin backport-731-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-731-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.

1 participant