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] Remove download option, link to builder #332

Merged
merged 1 commit into from
Dec 22, 2024
Merged

[TASK] Remove download option, link to builder #332

merged 1 commit into from
Dec 22, 2024

Conversation

linawolf
Copy link
Member

Releases: main, 13.4

@linawolf linawolf self-assigned this Dec 22, 2024
@linawolf linawolf enabled auto-merge (squash) December 22, 2024 14:48
@linawolf linawolf disabled auto-merge December 22, 2024 14:48
@linawolf linawolf merged commit a53699c into main Dec 22, 2024
3 checks passed
@linawolf linawolf deleted the task/FAQ branch December 22, 2024 14:48
Copy link
Contributor

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply fdd2af1... [TASK] Remove download option, link to builder
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/Faq/Index.rst
CONFLICT (content): Merge conflict in Documentation/Faq/Index.rst
Auto-merging Documentation/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-332-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick fdd2af1af82162783b16d6995450295763eb40a7
# Push it to GitHub
git push --set-upstream origin backport-332-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-332-to-13.4.

linawolf added a commit that referenced this pull request Dec 22, 2024
Releases: main, 13.4

(cherry picked from commit a53699c)
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