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

[DOCS] Document database records #4760

Merged
merged 10 commits into from
Sep 16, 2024
Merged

[DOCS] Document database records #4760

merged 10 commits into from
Sep 16, 2024

Conversation

linawolf
Copy link
Member

A detailed explanation of what they are was missing.

This is a preparation for documenting the
v13 additions of record objects.

Releases: main, 12.4

A detailed explanation of what they are was missing.

This is a preparation for documenting the
v13 additions of record objects.

Releases: main, 11.5
linawolf and others added 4 commits September 16, 2024 05:53
A detailed explanation of what they are was missing.

This is a preparation for documenting the
v13 additions of record objects.

Releases: main, 11.5
@Alagts Alagts merged commit 480828c into main Sep 16, 2024
9 checks passed
@Alagts Alagts deleted the task/records branch September 16, 2024 10:38
@linawolf linawolf added the backport 12.4 Backport to TYPO3v12 label Sep 16, 2024
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 27c7a83fb... [DOCS] Document database records
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/ApiOverview/ContentElements/Index.rst
Auto-merging Documentation/ApiOverview/Database/Index.rst
CONFLICT (content): Merge conflict in Documentation/ApiOverview/Database/Index.rst
Auto-merging Documentation/ExtensionArchitecture/Extbase/Reference/Domain/Model.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-4760-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 27c7a83fba3519a0f2d81376149271bc7b199058,269ebdf67ee632c8d8216ec61069f6cef7f3dc39,c7776e34098802fd641e3acc58d53cadd936f63d,3166049e003b88714dcbda9efb71a9ff8c6550db,00a77b5fe7a4f89f1e0b1beaf2f6f312b4f0f682,afab71095eb96ac0853f8dfffce14509d8a77d86,e1586a47bb60e007712de1b6e4490aba95a798fc,87c034ce9f2a16a4d9216e13cad95bf19179486d,dfaf460fa9a993cd6dd2189fdefe966c122901f9,b9d260a372c0f87d9a1336affa69d0ba67911e6b
# Push it to GitHub
git push --set-upstream origin backport-4760-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-4760-to-12.4.

linawolf added a commit that referenced this pull request Sep 16, 2024
* [DOCS] Document database records

A detailed explanation of what they are was missing.

This is a preparation for documenting the
v13 additions of record objects.

Releases: main, 11.5

* Update Documentation/ApiOverview/Database/Index.rst

Co-authored-by: Stefan Frömken <[email protected]>

* Apply suggestions from code review

Co-authored-by: Stefan Frömken <[email protected]>

* Apply suggestions from code review

Co-authored-by: Stefan Frömken <[email protected]>

* Update Documentation/ApiOverview/DatabaseRecords/Index.rst

Co-authored-by: Stefan Frömken <[email protected]>

* Update Documentation/ApiOverview/Database/Index.rst

Co-authored-by: Stefan Frömken <[email protected]>

* Update Documentation/ApiOverview/Database/Index.rst

* Update Index.rst

* Update Index.rst

* [DOCS] Document database records

A detailed explanation of what they are was missing.

This is a preparation for documenting the
v13 additions of record objects.

Releases: main, 11.5

---------

Co-authored-by: Stefan Frömken <[email protected]>

(cherry picked from commit 480828c)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 12.4 Backport to TYPO3v12 backport-done
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants