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

Important: #94246 GenericSudoModeConfiguration (#4728) #4748

Merged
merged 1 commit into from
Sep 10, 2024

Conversation

froemken
Copy link
Contributor

  • Important: #94246 GenericSudoModeConfiguration

Releases: main, 12.4
Resolves: TYPO3-Documentation/Changelog-To-Doc#470

  • Important: #94246 GenericSudoModeConfiguration

Releases: main, 12.4
Resolves: TYPO3-Documentation/Changelog-To-Doc#470

* Important: #94246 GenericSudoModeConfiguration

Releases: main, 12.4
Resolves: TYPO3-Documentation/Changelog-To-Doc#470

* Important: #94246 GenericSudoModeConfiguration

Releases: main, 12.4
Resolves: TYPO3-Documentation/Changelog-To-Doc#470
@froemken froemken merged commit 7548f94 into 12.4 Sep 10, 2024
11 checks passed
@froemken froemken deleted the backport-4728-to-12.4 branch September 10, 2024 20:41
@linawolf linawolf added backport 12.4 Backport to TYPO3v12 and removed backport 12.4 Backport to TYPO3v12 labels Sep 11, 2024
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
On branch backport-4748-to-12.4
You are currently cherry-picking commit 874b6ad1f.
  (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-4748-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 874b6ad1f6e7d397be2a4b73647ce198a27cec85
# Push it to GitHub
git push --set-upstream origin backport-4748-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-4748-to-12.4.

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
On branch backport-4748-to-12.4
You are currently cherry-picking commit 874b6ad1f.
  (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-4748-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 874b6ad1f6e7d397be2a4b73647ce198a27cec85
# Push it to GitHub
git push --set-upstream origin backport-4748-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-4748-to-12.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-done
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants