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] Overhaul HMENU root line page #1177

Merged
merged 4 commits into from
Apr 4, 2024
Merged

[TASK] Overhaul HMENU root line page #1177

merged 4 commits into from
Apr 4, 2024

Conversation

linawolf
Copy link
Member

@linawolf linawolf commented Apr 3, 2024

  • Use confvals
  • Correct indentation
  • Overhaul example

releases: main, 12.4, 11.5

* Use confvals
* Correct indentation
* Overhaul example

releases: main, 12.4, 11.5
* Use confvals
* Correct indentation
* Overhaul example

releases: main, 12.4, 11.5
@linawolf linawolf merged commit 2578096 into main Apr 4, 2024
2 checks passed
@linawolf linawolf deleted the task/hmenu-6 branch April 4, 2024 16:44
Copy link
Contributor

github-actions bot commented Apr 4, 2024

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 497df863... [TASK] Overhaul HMENU root line page
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
Auto-merging Documentation/ContentObjects/Hmenu/Rootline.rst
CONFLICT (content): Merge conflict in Documentation/ContentObjects/Hmenu/Rootline.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-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-1177-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 497df86310cd334bcad4ca66cc9a703e73acda75,70b69f6f63441efbf9bc39cb40a1c26f4528e042,845e223c1474b26dbc9d179f9db714e7fefbce92,ba35147cd0988d14b4c71cd49b3d78530534fe27
# Push it to GitHub
git push --set-upstream origin backport-1177-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-1177-to-11.5.

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

Successfully merging this pull request may close these issues.

2 participants