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] Use internal links for permissions #4863

Merged
merged 1 commit into from
Oct 18, 2024
Merged

[BUGFIX] Use internal links for permissions #4863

merged 1 commit into from
Oct 18, 2024

Conversation

linawolf
Copy link
Member

Users and Permissions have been moved from getting started

Releases: main, 13.4, 12.4

Users and Permissions have been moved from getting started

Releases: main, 13.4, 12.4
@linawolf linawolf self-assigned this Oct 18, 2024
@linawolf linawolf added backport 12.4 Backport to TYPO3v12 backport 13.4 Backport to TYPO3v13 labels Oct 18, 2024
@linawolf linawolf merged commit 82b9971 into main Oct 18, 2024
27 checks passed
@linawolf linawolf deleted the task/fix-links branch October 18, 2024 08:02
Copy link
Contributor

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
Auto-merging Documentation/ApiOverview/Fal/Administration/Permissions.rst
On branch backport-4863-to-12.4
You are currently cherry-picking commit 16223b7d2.
  (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-4863-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 16223b7d29a73d8e69581c0bab59336c79c9615c
# Push it to GitHub
git push --set-upstream origin backport-4863-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-4863-to-12.4.

Copy link
Contributor

The backport to 13.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-4863-to-13.4
You are currently cherry-picking commit 16223b7d2.
  (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-13.4 13.4
# Navigate to the new working tree
cd .worktrees/backport-13.4
# Create a new branch
git switch --create backport-4863-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 16223b7d29a73d8e69581c0bab59336c79c9615c
# Push it to GitHub
git push --set-upstream origin backport-4863-to-13.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-13.4

Then, create a pull request where the base branch is 13.4 and the compare/head branch is backport-4863-to-13.4.

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 13.4 Backport to TYPO3v13 backport-done
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant