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

Ctrl has two main categories, but mentioned three - Update Index.rst #769

Merged
merged 1 commit into from
Sep 8, 2023

Conversation

Alagts
Copy link
Contributor

@Alagts Alagts commented Sep 8, 2023

It is confusing for the reader to see three points after mentioning that there are two main categories

It is confusing for the reader to see three points after mentioning that there are two main categories
Copy link
Member

@linawolf linawolf left a comment

Choose a reason for hiding this comment

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

Thanks for catching this!

@linawolf linawolf merged commit dca8800 into TYPO3-Documentation:12.4 Sep 8, 2023
2 checks passed
@github-actions
Copy link

github-actions bot commented Sep 8, 2023

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

stdout
On branch backport-769-to-12.4
You are currently cherry-picking commit fe99ae2.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

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-769-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick fe99ae2f3ca2c014e716ed698b038ddd6aeb2623
# Push it to GitHub
git push --set-upstream origin backport-769-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-769-to-12.4.

@linawolf
Copy link
Member

linawolf commented Sep 8, 2023

@Alagts you made your changes on branch 12.4 here. That is why the automatic backport failed. Please, if a change applies to all versions, make your changes on the main branch. This enables us to use our automatic backport workflow. While a preport to main can only be done manually (I will do that later for you)

linawolf pushed a commit that referenced this pull request Sep 8, 2023
…769)

Ctrl has two main categories. mentioned three - Update Index.rst

It is confusing for the reader to see three points after mentioning that there are two main categories
brotkrueml pushed a commit that referenced this pull request Sep 11, 2023
Ctrl has two main categories, but mentioned three - Update Index.rst (#769)

Ctrl has two main categories. mentioned three - Update Index.rst

It is confusing for the reader to see three points after mentioning that there are two main categories

Co-authored-by: Sandra Erbel <[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