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

Move Extension installation in minimal example #265

Conversation

jonirouAtTalan
Copy link
Contributor

Second try ;-)

Releases : main, 13.4

Documentation/MinimalExample/Index.rst Outdated Show resolved Hide resolved
Documentation/MinimalExample/Index.rst Outdated Show resolved Hide resolved
jonirouAtTalan and others added 3 commits November 19, 2024 14:55
Co-authored-by: Lina Wolf <48202465+linawolf@users.noreply.github.com>
Co-authored-by: Lina Wolf <48202465+linawolf@users.noreply.github.com>
Copy link
Member

@linawolf linawolf left a comment

Choose a reason for hiding this comment

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

Good work!

@linawolf linawolf self-assigned this Nov 19, 2024
@linawolf linawolf merged commit 9c0f99a into TYPO3-Documentation:main Nov 19, 2024
3 checks passed
Copy link

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-265-to-13.4
You are currently cherry-picking commit 9517734.
  (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-265-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 9517734c1d75701dd5d4a48868c8b2a21bb3ab0c,194b5096a79fa2be1ca711c3f8c994b5cbefb88c,8d70c439dffdbc9bc0db465718961a5d43c3905e,8e7b131422f7bb028b5ec57dc52ebb1315e56eaa,1523f9b7fe391a112bb7727bc2aff31f2e7dafd2,eb2ce7905231e835f790c317fe36110fabaa25f8,3693d85d217925876fa5414f0e461c1257672c19,0e5074da3a380a239c4360efe71062fc92d8b8be,23544e879aa5a57d14b353981a053c3ab9b03430,5e502eb1f8f535858ecb77bd0e911aba6a1ab86b,2135ee2045ff73dd37e5fa3b019d90375e8ad43b,14af6e1c8784f18665fde060085b7a4724836770,ec69bb8617b5a088c032103b0ff90306d588688c,96f6e3487a4f0b14f0b6364bbf28de1a863b71ad,faa51ef83e1b671a882fdc5eeca8dff70541ca18,9ee1637664333b2dabbf6416c1ec85a6928b6336,09e023c91c7b3585b73abf6360fbe60d2d67f53b,9835a90fc6fbb0641e9291ac4c00b7a4e17536d0
# Push it to GitHub
git push --set-upstream origin backport-265-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-265-to-13.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