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 Permissions Synchronization chapter to Permissions Management docs #339

Conversation

soee
Copy link
Contributor

@soee soee commented Feb 29, 2024

No description provided.

Copy link
Contributor

@garvinhicking garvinhicking left a comment

Choose a reason for hiding this comment

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

Looks good to me! :-)

(Would phrase a few sentences differently, but then again I'm also no native writer)

@garvinhicking garvinhicking requested a review from linawolf March 4, 2024 10:58
@garvinhicking
Copy link
Contributor

@linawolf You worked on this with Marcin mainly, can you check if this can be merged?

@linawolf
Copy link
Member

linawolf commented Mar 4, 2024

@soee we should backport this to TYPO3 v12 and maybe 11?

@soee soee force-pushed the gettingStartedPermissionsSynchronization branch from 07c80ec to a7dfa14 Compare March 5, 2024 11:37
@linawolf
Copy link
Member

linawolf commented Mar 5, 2024

@soee please resolve conflicts

@soee soee force-pushed the gettingStartedPermissionsSynchronization branch from a7dfa14 to c218073 Compare March 5, 2024 13:31
@linawolf linawolf merged commit eddf7b2 into TYPO3-Documentation:main Mar 5, 2024
4 checks passed
Copy link
Contributor

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 c218073... [TASK] Add Permissions Synchronization chapter to 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-339-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c2180734093b1275aa8761b727b4bf930c02e102,77b756fb93d16803fc2d5ee4be3a95fb578e8afa
# Push it to GitHub
git push --set-upstream origin backport-339-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-339-to-11.5.

Copy link
Contributor

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 c218073... [TASK] Add Permissions Synchronization chapter to 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-339-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c2180734093b1275aa8761b727b4bf930c02e102,77b756fb93d16803fc2d5ee4be3a95fb578e8afa
# Push it to GitHub
git push --set-upstream origin backport-339-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-339-to-12.4.

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.

3 participants