WIP: Merge branch 'zecoxao:main' into main #21

Draft
drakmor wants to merge 13 commits from drakmor/main into main
drakmor commented 2026-08-18 01:55:09 -05:00 (Migrated from github.com)
No description provided.
This pull request is broken due to missing fork information.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 'drakmor/main:drakmor/main'
git switch 'drakmor/main'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'main'
git merge --no-ff 'drakmor/main'
git switch 'drakmor/main'
git rebase 'main'
git switch 'main'
git merge --ff-only 'drakmor/main'
git switch 'drakmor/main'
git rebase 'main'
git switch 'main'
git merge --no-ff 'drakmor/main'
git switch 'main'
git merge --squash 'drakmor/main'
git switch 'main'
git merge --ff-only 'drakmor/main'
git switch 'main'
git merge 'drakmor/main'
git push origin 'main'
Sign in to join this conversation.
No description provided.