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

Update GuiLabel of SiteManagement -> TypoScript (#1503) #1505

Merged
merged 1 commit into from
Jan 16, 2025

Conversation

froemken
Copy link
Contributor

No description provided.

@froemken
Copy link
Contributor Author

Sorry. Merged to original one too fast. It was for 12.4. I have cherry-picked it and created a new PR, but now someone else has to approve.

@garvinhicking garvinhicking merged commit 288b39e into main Jan 16, 2025
9 checks passed
@garvinhicking garvinhicking deleted the backport-1503-to-main branch January 16, 2025 22:30
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-1505-to-13.4
You are currently cherry-picking commit 0daf8d41.
  (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-1505-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0daf8d412048d3e5f9c027f7843a678d49fc0d09
# Push it to GitHub
git push --set-upstream origin backport-1505-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-1505-to-13.4.

@froemken
Copy link
Contributor Author

Thank you. No need to backport to 13.4. Already done here: #1503

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants