search

TYPO3-Documentation / t3docs-examples

This extension packages a number of code examples from the Core Documentation.
GNU General Public License v2.0
23 stars 17 forks source link

[DOCS] Add changelog for version 12.0.3 #250

Closed brotkrueml closed 7 months ago

brotkrueml commented 7 months ago

Releases: main, 12.4

github-actions[bot] commented 7 months ago

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply fa7ea94... [DOCS] Add changelog for version 12.0.3 hint: After resolving the conflicts, mark them with hint: "git add/rm ", 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 CHANGELOG.md CONFLICT (content): Merge conflict in CHANGELOG.md ```

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-250-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick fa7ea94287457a3f9ec4bd71546090d783e29ccf,2e008a37ce9d781ac078ed219f5805f59e3613bf
# Push it to GitHub
git push --set-upstream origin backport-250-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-250-to-12.4.