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 Dataprocessor chapter #1144

Merged
merged 4 commits into from
Mar 25, 2024

Conversation

linawolf
Copy link
Member

Add missing anchors and headlines

releases: main, 12.4

Add missing anchors and headlines

releases: main, 12.4
@linawolf linawolf self-assigned this Mar 24, 2024
Copy link
Contributor

@brotkrueml brotkrueml left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should also be backported to 11.5 as these confvals are used there and to avoid warnings on rendering.

@linawolf linawolf changed the title [TASK] Set unique names for confvals in Dataprocesso chapter [TASK] Set unique names for confvals in Dataprocessor chapter Mar 24, 2024
@linawolf linawolf requested a review from brotkrueml March 24, 2024 18:35
@linawolf linawolf merged commit ad5a372 into main Mar 25, 2024
1 check passed
@linawolf linawolf deleted the task/name-8 branch March 25, 2024 04:49
Copy link
Contributor

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 1d4db883... [TASK] Set unique names for confvals in Dataprocesso 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
Auto-merging Documentation/ContentObjects/Fluidtemplate/DataProcessing/CommaSeparatedValueProcessor.rst
Auto-merging Documentation/ContentObjects/Fluidtemplate/DataProcessing/DatabaseQueryProcessor.rst
Auto-merging Documentation/ContentObjects/Fluidtemplate/DataProcessing/FilesProcessor.rst
Auto-merging Documentation/ContentObjects/Fluidtemplate/DataProcessing/FlexFormProcessor.rst
CONFLICT (content): Merge conflict in Documentation/ContentObjects/Fluidtemplate/DataProcessing/FlexFormProcessor.rst
Auto-merging Documentation/ContentObjects/Fluidtemplate/DataProcessing/GalleryProcessor.rst
Auto-merging Documentation/ContentObjects/Fluidtemplate/DataProcessing/LanguageMenuProcessor.rst
Auto-merging Documentation/ContentObjects/Fluidtemplate/DataProcessing/MenuProcessor.rst
CONFLICT (modify/delete): Documentation/ContentObjects/Fluidtemplate/DataProcessing/SiteLanguageProcessor.rst deleted in HEAD and modified in 1d4db883 ([TASK] Set unique names for confvals in Dataprocesso chapter).  Version 1d4db883 ([TASK] Set unique names for confvals in Dataprocesso chapter) of Documentation/ContentObjects/Fluidtemplate/DataProcessing/SiteLanguageProcessor.rst left in tree.
Auto-merging Documentation/ContentObjects/Fluidtemplate/DataProcessing/SiteProcessor.rst
Auto-merging Documentation/ContentObjects/Fluidtemplate/DataProcessing/SplitProcessor.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-1144-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 1d4db883aa7d51114544c07bf0d247ee90712f5d,085173f2e34cc72c4d0768db1abe13422e7e4d02,f8c9d6a36299477f555e5fc1eb3033e32929988f,34dd0c13003b4349fdab1de683d5670ac92f1f25
# Push it to GitHub
git push --set-upstream origin backport-1144-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-1144-to-11.5.

Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 1d4db883... [TASK] Set unique names for confvals in Dataprocesso 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
Auto-merging Documentation/ContentObjects/Fluidtemplate/DataProcessing/FlexFormProcessor.rst
CONFLICT (content): Merge conflict in Documentation/ContentObjects/Fluidtemplate/DataProcessing/FlexFormProcessor.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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-1144-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 1d4db883aa7d51114544c07bf0d247ee90712f5d,085173f2e34cc72c4d0768db1abe13422e7e4d02,f8c9d6a36299477f555e5fc1eb3033e32929988f,34dd0c13003b4349fdab1de683d5670ac92f1f25
# Push it to GitHub
git push --set-upstream origin backport-1144-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

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

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