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] Remove common properties #1147

Merged
merged 2 commits into from
Aug 8, 2024
Merged

[TASK] Remove common properties #1147

merged 2 commits into from
Aug 8, 2024

Conversation

linawolf
Copy link
Member

@linawolf linawolf commented Aug 8, 2024

No description provided.

@linawolf linawolf merged commit 2e21b5b into main Aug 8, 2024
5 checks passed
@linawolf linawolf deleted the task/select-properties branch August 8, 2024 06:52
Copy link

github-actions bot commented Aug 8, 2024

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 15af6f6a... [TASK] Remove common properties
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".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging Documentation/ColumnsConfig/Type/Select/CheckBox/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Select/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Select/MultipleSideBySide/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Select/Properties/ItemGroups.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Select/Properties/ItemGroups.rst
CONFLICT (modify/delete): Documentation/ColumnsConfig/Type/Select/Properties/Items.rst deleted in 15af6f6a ([TASK] Remove common properties) and modified in HEAD.  Version HEAD of Documentation/ColumnsConfig/Type/Select/Properties/Items.rst left in tree.
CONFLICT (modify/delete): Documentation/ColumnsConfig/Type/Select/Properties/Mm.rst deleted in 15af6f6a ([TASK] Remove common properties) and modified in HEAD.  Version HEAD of Documentation/ColumnsConfig/Type/Select/Properties/Mm.rst left in tree.
Auto-merging Documentation/ColumnsConfig/Type/Select/Single/Index.rst
CONFLICT (modify/delete): Documentation/ColumnsConfig/Type/Select/Single/_Properties/_DbFieldLength.rst.txt deleted in HEAD and modified in 15af6f6a ([TASK] Remove common properties).  Version 15af6f6a ([TASK] Remove common properties) of Documentation/ColumnsConfig/Type/Select/Single/_Properties/_DbFieldLength.rst.txt left in tree.
Auto-merging Documentation/ColumnsConfig/Type/Select/Single/_Properties/_Items.rst.txt
Auto-merging Documentation/ColumnsConfig/Type/Select/Single/_Properties/_Mm.rst.txt
Auto-merging Documentation/ColumnsConfig/Type/Select/SingleBox/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Select/Tree/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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-1147-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 15af6f6a6ab69c31c929a153c069a4b1fded02a7,339c008780e0d4526691317dfa21ad6e8fc87092
# Push it to GitHub
git push --set-upstream origin backport-1147-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-1147-to-12.4.

linawolf added a commit that referenced this pull request Aug 8, 2024
* [TASK] Remove common properties

* [TASK] Remove common properties

(cherry picked from commit 2e21b5b)
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.

1 participant