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

[BUGFIX] Fix references #967

Merged
merged 1 commit into from
Mar 10, 2024
Merged

[BUGFIX] Fix references #967

merged 1 commit into from
Mar 10, 2024

Conversation

linawolf
Copy link
Member

Preparation for switch to PHP-based rendering

The guides are more strict in using interlinks then sphinx

Preparation for switch to PHP-based rendering

The guides are more strict in using interlinks then sphinx
@linawolf linawolf merged commit 19fde0a into main Mar 10, 2024
4 checks passed
@linawolf linawolf deleted the task/fix-references branch March 10, 2024 09:52
Copy link
Contributor

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply ead75c6... [BUGFIX] Fix references
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/ColumnsConfig/Type/File/Properties/Appearance.rst deleted in HEAD and modified in ead75c6 ([BUGFIX] Fix references).  Version ead75c6 ([BUGFIX] Fix references) of Documentation/ColumnsConfig/Type/File/Properties/Appearance.rst left in tree.
Auto-merging Documentation/ColumnsConfig/Type/Flex/Index.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Flex/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Flex/Properties/DsPointerFieldSearchParent.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Flex/Properties/DsPointerFieldSearchParent.rst
Auto-merging Documentation/ColumnsConfig/Type/Flex/Properties/DsPointerFieldSearchParentSubField.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Flex/Properties/DsPointerFieldSearchParentSubField.rst
Auto-merging Documentation/ColumnsConfig/Type/Flex/Properties/DsTableField.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Flex/Properties/DsTableField.rst
Auto-merging Documentation/ColumnsConfig/Type/Inline/Examples.rst
CONFLICT (modify/delete): Documentation/ColumnsConfig/Type/Password/Properties/PasswordPolicy.rst deleted in HEAD and modified in ead75c6 ([BUGFIX] Fix references).  Version ead75c6 ([BUGFIX] Fix references) of Documentation/ColumnsConfig/Type/Password/Properties/PasswordPolicy.rst left in tree.
Auto-merging Documentation/ColumnsConfig/Type/Select/Properties/SelectTreeConfig.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Select/Properties/SelectTreeConfig.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-967-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ead75c6abf9557d63e69540e10433146a89c4a88
# Push it to GitHub
git push --set-upstream origin backport-967-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-967-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 ead75c6... [BUGFIX] Fix references
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/ColumnsConfig/Type/File/Properties/Appearance.rst
Auto-merging Documentation/ColumnsConfig/Type/Flex/Index.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Flex/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Flex/Properties/DsPointerFieldSearchParent.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Flex/Properties/DsPointerFieldSearchParent.rst
Auto-merging Documentation/ColumnsConfig/Type/Flex/Properties/DsPointerFieldSearchParentSubField.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Flex/Properties/DsPointerFieldSearchParentSubField.rst
Auto-merging Documentation/ColumnsConfig/Type/Flex/Properties/DsTableField.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Flex/Properties/DsTableField.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-967-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ead75c6abf9557d63e69540e10433146a89c4a88
# Push it to GitHub
git push --set-upstream origin backport-967-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-967-to-12.4.

linawolf added a commit that referenced this pull request Mar 10, 2024
Preparation for switch to PHP-based rendering

The guides are more strict in using interlinks then sphinx

(cherry picked from commit 19fde0a)
linawolf added a commit that referenced this pull request Mar 10, 2024
* [DOCS] Backport 12.4, Switch to PHP based documentation rendering (#968)

* Create guides.xml
* Remove now outdated Settings.cfg
* Remove outdated genindex.rst
* Remove outdated screenshots.json
* Introduce automatic testing for documentation changes
* Introduce make file for easy local rendering

(cherry picked from commit 556af29)

* [BUGFIX] Fix references (#967)

Preparation for switch to PHP-based rendering

The guides are more strict in using interlinks then sphinx

(cherry picked from commit 19fde0a)

* [BUGFIX] Delete Settings
linawolf added a commit that referenced this pull request Jul 14, 2024
linawolf added a commit that referenced this pull request Jul 14, 2024
* [FEATURE] Add default TCA columns from ctrl #967

Releases: main
Resolves: TYPO3-Documentation/Changelog-To-Doc#967

---------

Co-authored-by: Stefan Frömken <[email protected]>
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