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] Merge properties back into ctrl page #1155

Merged
merged 13 commits into from
Aug 16, 2024
Merged

[TASK] Merge properties back into ctrl page #1155

merged 13 commits into from
Aug 16, 2024

Conversation

linawolf
Copy link
Member

No description provided.

@linawolf linawolf merged commit bb881a7 into main Aug 16, 2024
5 checks passed
@linawolf linawolf deleted the task/ctrl branch August 16, 2024 04:27
Copy link

The backport to 12.4 failed:

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

stdout
Auto-merging Documentation/BestPractises/CommonFields.rst
Auto-merging Documentation/BestPractises/LanguageFields.rst
CONFLICT (modify/delete): Documentation/Ctrl/AutoCreatedColumns.rst deleted in HEAD and modified in da51c7d4 ([TASK] Merge properties back into ctrl page).  Version da51c7d4 ([TASK] Merge properties back into ctrl page) of Documentation/Ctrl/AutoCreatedColumns.rst left in tree.
Auto-merging Documentation/Ctrl/EnableColumns.rst
CONFLICT (content): Merge conflict in Documentation/Ctrl/EnableColumns.rst
Auto-merging Documentation/Ctrl/Index.rst
CONFLICT (content): Merge conflict in Documentation/Ctrl/Index.rst
CONFLICT (rename/delete): Documentation/Ctrl/Properties/_AutoCreateWarning.rst.txt renamed to Documentation/Ctrl/_CodeSnippets/_AutoCreatedColumns/_AutoCreateWarning.rst.txt in da51c7d4 ([TASK] Merge properties back into ctrl page), but deleted in HEAD.
CONFLICT (rename/delete): Documentation/Ctrl/_AutoCreatedColumns/_OverrideHiddenDefault.php renamed to Documentation/Ctrl/_CodeSnippets/_AutoCreatedColumns/_OverrideHiddenDefault.php in da51c7d4 ([TASK] Merge properties back into ctrl page), but deleted in HEAD.
CONFLICT (rename/delete): Documentation/Ctrl/_AutoCreatedColumns/_autoCreatePages.php renamed to Documentation/Ctrl/_CodeSnippets/_AutoCreatedColumns/_autoCreatePages.php in da51c7d4 ([TASK] Merge properties back into ctrl page), but deleted in HEAD.
CONFLICT (rename/delete): Documentation/Ctrl/_AutoCreatedColumns/_pages.php renamed to Documentation/Ctrl/_CodeSnippets/_AutoCreatedColumns/_pages.php in da51c7d4 ([TASK] Merge properties back into ctrl page), but deleted in HEAD.
CONFLICT (rename/delete): Documentation/Ctrl/Properties/_CodeSnippets/_Enablecolumns.diff renamed to Documentation/Ctrl/_CodeSnippets/_Enablecolumns.diff in da51c7d4 ([TASK] Merge properties back into ctrl page), but deleted in HEAD.
CONFLICT (rename/delete): Documentation/Ctrl/Properties/_CodeSnippets/_Enablecolumns.php renamed to Documentation/Ctrl/_CodeSnippets/_Enablecolumns.php in da51c7d4 ([TASK] Merge properties back into ctrl page), but deleted in HEAD.
CONFLICT (rename/delete): Documentation/Ctrl/Properties/_CodeSnippets/_Language.diff renamed to Documentation/Ctrl/_CodeSnippets/_Language.diff in da51c7d4 ([TASK] Merge properties back into ctrl page), but deleted in HEAD.
Auto-merging Documentation/Ctrl/_Properties/_DescriptionColumn.rst.txt
CONFLICT (content): Merge conflict in Documentation/Ctrl/_Properties/_DescriptionColumn.rst.txt
Auto-merging Documentation/Ctrl/_Properties/_Editlock.rst.txt
CONFLICT (content): Merge conflict in Documentation/Ctrl/_Properties/_Editlock.rst.txt
Auto-merging Documentation/Ctrl/_Properties/_LanguageField.rst.txt
CONFLICT (content): Merge conflict in Documentation/Ctrl/_Properties/_LanguageField.rst.txt
Auto-merging Documentation/Ctrl/_Properties/_TransOrigDiffSourceField.rst.txt
CONFLICT (content): Merge conflict in Documentation/Ctrl/_Properties/_TransOrigDiffSourceField.rst.txt
Auto-merging Documentation/Ctrl/_Properties/_TransOrigPointerField.rst.txt
CONFLICT (content): Merge conflict in Documentation/Ctrl/_Properties/_TransOrigPointerField.rst.txt
Auto-merging Documentation/Ctrl/_Properties/_TranslationSource.rst.txt
CONFLICT (content): Merge conflict in Documentation/Ctrl/_Properties/_TranslationSource.rst.txt

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-1155-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick da51c7d4d8bc9a432ef72235b568688fc458ebdc,ef7473684c9e1003f76da24b30f112f8d002dced,fd614ca38a5792af049e87262ace6cfcfe2f7d78,5bbe369f77736eab3fe7002077841467cbd8b6ed,583ae54ce0079c5e1b0e25ea2ae5659eac05395e,afadf4139144d67fd43d0e9db779e1ee9fc7bed0,2028506a7e92b7c24ad36b3a2bd7afeb4f53dce6,85de6e24c45f0ed2ba80d8e16f226920ebba601a,fb61ebbc1918ba40b01a24e10f31dafca64f3faa,acf60cc317f136dfc7a96c19837df9d369af8cc7,f176dd6d22ae1ed6c8653f0cab99d2e88a42ef73,3b94fab8279023c000fb17f87a42968713a743d0,5c261f205e407ff8565c4073557d8cd49acec9fb
# Push it to GitHub
git push --set-upstream origin backport-1155-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-1155-to-12.4.

linawolf added a commit that referenced this pull request Aug 16, 2024
* [TASK] Merge properties back into ctrl page

* Update Documentation/Ctrl/_Properties/_Delete.rst.txt

* Apply suggestions from code review

* Apply suggestions from code review

* Update Documentation/Ctrl/EnableColumns.rst

* Update Documentation/Ctrl/_Properties/_Container.rst.txt

* Update Documentation/Ctrl/_Properties/_CopyAfterDuplFields.rst.txt

* Update Documentation/Ctrl/_Properties/_DescriptionColumn.rst.txt

* Update Documentation/Ctrl/_Properties/_Iconfile.rst.txt

* Update Documentation/Ctrl/_Properties/_Label.rst.txt

* Update Documentation/Ctrl/_Properties/_SearchFields.rst.txt

* Apply suggestions from code review

* Update Documentation/Ctrl/_Properties/_TransOrigPointerField.rst.txt

---------

Co-authored-by: Stefan Frömken <froemken@gmail.com>

(cherry picked from commit bb881a7)
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