Skip to content
This repository has been archived by the owner on Nov 19, 2024. It is now read-only.

[TASK] Switch to confvals for mod.SHARED #452

Merged
merged 1 commit into from
Apr 13, 2024
Merged

[TASK] Switch to confvals for mod.SHARED #452

merged 1 commit into from
Apr 13, 2024

Conversation

linawolf
Copy link
Member

releases: main, 12.4, 11.5

releases: main, 12.4, 11.5
@linawolf linawolf merged commit 684e6db into main Apr 13, 2024
6 checks passed
@linawolf linawolf deleted the task/mod branch April 13, 2024 04:53
Copy link
Contributor

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply cd3287c... [TASK] Switch to confvals for mod.SHARED
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/Shared.rst deleted in HEAD and modified in cd3287c ([TASK] Switch to confvals for mod.SHARED).  Version cd3287c ([TASK] Switch to confvals for mod.SHARED) of Documentation/PageTsconfig/Mod/Shared.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-452-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick cd3287c97cc8ae74f96fa365f28f7c7e27f5338f
# Push it to GitHub
git push --set-upstream origin backport-452-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-452-to-11.5.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants