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] Switch to confvals for mod.web_info #453

Merged
merged 1 commit into from
Apr 13, 2024
Merged

[TASK] Switch to confvals for mod.web_info #453

merged 1 commit into from
Apr 13, 2024

Conversation

linawolf
Copy link
Member

@linawolf linawolf commented Apr 12, 2024

releases: main, 12.4

Page did not yet exist in 11.5

@linawolf linawolf merged commit 95d01a1 into main Apr 13, 2024
6 checks passed
@linawolf linawolf deleted the task/mod2 branch April 13, 2024 04:39
Copy link
Contributor

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0b1a213... [TASK] Switch to confvals for mod.web_info
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".

stdout
CONFLICT (modify/delete): Documentation/PageTsconfig/Mod/WebInfo.rst deleted in HEAD and modified in 0b1a213 ([TASK] Switch to confvals for mod.web_info).  Version 0b1a213 ([TASK] Switch to confvals for mod.web_info) of Documentation/PageTsconfig/Mod/WebInfo.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-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-453-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0b1a213ddbedca0f9713142b2bc6a054c0ca4d84
# Push it to GitHub
git push --set-upstream origin backport-453-to-11.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-11.5

Then, create a pull request where the base branch is 11.5 and the compare/head branch is backport-453-to-11.5.

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