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] Add Groups Inheritance chapter for Permissions Management docs #335

Conversation

soee
Copy link
Contributor

@soee soee commented Feb 28, 2024

No description provided.

@soee soee force-pushed the gettingStartedPermissionsGgroupsInheritance branch from 2cdc102 to 9c38826 Compare February 28, 2024 14:25
@soee soee changed the title [TASK] Add Groups Inheritance chaper for Permissions Management docs [TASK] Add Groups Inheritance chapter for Permissions Management docs Feb 28, 2024
@soee soee force-pushed the gettingStartedPermissionsGgroupsInheritance branch from 9c38826 to 1b52455 Compare March 5, 2024 11:38
@linawolf
Copy link
Member

linawolf commented Mar 5, 2024

@soee please resolve conflicts

@soee soee force-pushed the gettingStartedPermissionsGgroupsInheritance branch from 1b52455 to b4732a9 Compare March 5, 2024 13:28
@soee
Copy link
Contributor Author

soee commented Mar 5, 2024

@soee please resolve conflicts

@linawolf done

@linawolf linawolf merged commit f9f651a into TYPO3-Documentation:main Mar 5, 2024
4 checks passed
Copy link

github-actions bot commented Mar 5, 2024

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply b4732a9... [TASK] Add Groups Inheritance chapter for Permissions Management docs
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/PermissionsManagement/Index.rst
CONFLICT (content): Merge conflict in Documentation/PermissionsManagement/Index.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-335-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b4732a9e7f36224dccecf440f1a4a61ab94929bb
# Push it to GitHub
git push --set-upstream origin backport-335-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-335-to-11.5.

Copy link

github-actions bot commented Mar 5, 2024

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply b4732a9... [TASK] Add Groups Inheritance chapter for Permissions Management docs
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/PermissionsManagement/Index.rst
CONFLICT (content): Merge conflict in Documentation/PermissionsManagement/Index.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-335-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b4732a9e7f36224dccecf440f1a4a61ab94929bb
# Push it to GitHub
git push --set-upstream origin backport-335-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-335-to-12.4.

@linawolf
Copy link
Member

linawolf commented Mar 5, 2024

@soee please make manual backports if needed

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