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] Set unique names for confvals in cobjects chapter #1147

Merged
merged 3 commits into from
Mar 25, 2024
Merged

Conversation

linawolf
Copy link
Member

Add missing anchors

releases: main, 12.4, 11.5

Add missing anchors

releases: main, 12.4, 11.5
@linawolf linawolf merged commit 81c66cc into main Mar 25, 2024
@linawolf linawolf deleted the task/name-9 branch March 25, 2024 07:35
Copy link
Contributor

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply a7a69941... [TASK] Set unique names for confvals in cobjects chapter
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/ContentObjects/Extbaseplugin/Index.rst deleted in HEAD and modified in a7a69941 ([TASK] Set unique names for confvals in cobjects chapter).  Version a7a69941 ([TASK] Set unique names for confvals in cobjects chapter) of Documentation/ContentObjects/Extbaseplugin/Index.rst left in tree.
Auto-merging Documentation/ContentObjects/Fluidtemplate/Index.rst
Auto-merging Documentation/ContentObjects/Image/Index.rst
Auto-merging Documentation/ContentObjects/ImgResource/Index.rst
Auto-merging Documentation/ContentObjects/Records/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-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-1147-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a7a69941d1dc239f537174aca43ccfda9febbf60,c70d22f76d98c0bbcd8a7477a3afab4050edf2cc,75a4816840dbb8903147efc8513970773f64bcb7
# Push it to GitHub
git push --set-upstream origin backport-1147-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-1147-to-11.5.

@linawolf linawolf added backport-done Changes have been backported to other branches already and removed backport failed labels Mar 25, 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